Merge "Fix some broke cache key generations"