more cache issues changes