Updated cache design