reworked cache/loader