Fix configuration cache (#934)