Updated Cache interface