Moving caching back to the main app, as main uses caching and all cache objects are main objects.