fixes to cache