Adding #cache_key support