more cache improvements