caching API improvements