Merge "Make sure we correctly copy caches keys. Bug #5136067"