Added cache files
Refactoring