Work on caching for services