am a8a48949: Merge "Fix incorrect cache key."

* commit 'a8a489492749b845cc2a85d67c664449d7b0b019':
  Fix incorrect cache key.