Temporary solution to the cache key problem