Updates from code review; mostly rename
Fix rename deleting cache file