Rename cacheId and entityId to key, which is more cache-like