More cache optimizations