- refactoring on cache service