Revert files, going to put all cache stuff in one commit
Check cache age