Merge "Refactor KeysCache to UniqueKeysCache"