more cache fixes [ci skip]