Fix tests; cache expects cachetime now

Change-Id: I3f85daf0973c468686c07d26375c3a8dc242676d
Merge "Fix tests; cache expects cachetime now"