- some minor CacheService refactoring