fix cache keys