Configuration caching fixes