Fixes to cache timestamps