Moved eviction logic to service.
Merge branch 'feature/cache-service' into develop