Added service providers and caching