more cache fixes