Improved caching of service container