Merge "Fix cache key calculation"