Reworked cache