Misc changes to cache