changed structure of cache keys