removed unused imports
move Cache to new file