reworked cache