Refactor KeysCache to UniqueKeysCache

Change-Id: I8e3c4705c705a1c6e05e9112211d7012912d7e41
6 files changed