am b4cd42a1: Extracting out CacheKey to a separate class

* commit 'b4cd42a1df69ec887d0c66e8fe6fe1f27ebbf9bc':
  Extracting out CacheKey to a separate class