Added service caching.