Even more cache performance improvements...