Fix not properly computed cachekey.

Old computation caused collisions in some cases.
Fix typo