Further cache optimization