Changing cache validity key names
Applying new cacheValidity key names