Cache API improvements