[CLC-1641] Unhappy check for existing key in cache
Merge pull request #935 from yuhunglin/CLC-1641

[CLC-1641] Unhappy check for existing key in cache