Fix more thinkos wrt cache consolidation.