cache_keys: rearrange caching decorator
cache_keys: version bump