Cache tweaks again, again working a little bit better