cache fixes
more cache fixes