more cache improvements, bugfixes