Refactoring CacheOperationHandler & Initial work on CacheHanderService tests