use new cache key format all over the place