use correct keys for cache