first pass of local cache / db for all files
Small cleanup
Removing old __cache code
Cleaning up logging messages