cache fixes
wip