Refactoring
Caching in extra directory