Caching without override policy
Refactoring
Caching complete