Updated the way the config caching works
Improved the caching