Fix cached configuration (part 2)