Couple of fixes to cache handler