Store cache files two-directories deeper
Cleaning up some code.