Added support for cache service