More cache optimization