Updated cache interface again