fix cache key to be more unique