Use versioned cache key

[UmanShahzad]

Make sure the cache key contains a number to indicate the version of the cached data. Data changes that change what's expected in cached data require a version change.