Updated cache maker