Updated the way the config caching works