Fix cache key (again) [RD-62]