Improved service caching support.