Refined config caching fix