switch to using cache key