Add a version number to cache keys

This will allow us to invalidate cache if something is wrong with cache data

Change-Id: I8eb0b0826cf131b0ea09ecb30f44bb3559c0699f