diff --git a/source/blender/draw/intern/draw_cache_extract.hh b/source/blender/draw/intern/draw_cache_extract.hh
index 37885fe470e..00488b44dc5 100644
--- a/source/blender/draw/intern/draw_cache_extract.hh
+++ b/source/blender/draw/intern/draw_cache_extract.hh
@@ -256,9 +256,8 @@ struct MeshBatchCache {
   MeshBatchList batch;
 
   /* Index buffer per material. These are sub-ranges of `ibo.tris`. */
-  gpu::IndexBuf **tris_per_mat;
-
-  gpu::Batch **surface_per_mat;
+  Array<gpu::IndexBuf *> tris_per_mat;
+  Array<gpu::Batch *> surface_per_mat;
 
   DRWSubdivCache *subdiv_cache;
 
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc
index 8ea2e010d94..96af6f61dae 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.cc
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc
@@ -596,10 +596,8 @@ static void mesh_batch_cache_init(Object *object, Mesh *mesh)
   }
 
   cache->mat_len = mesh_render_mat_len_get(object, mesh);
-  cache->surface_per_mat = static_cast<gpu::Batch **>(
-      MEM_callocN(sizeof(*cache->surface_per_mat) * cache->mat_len, __func__));
-  cache->tris_per_mat = static_cast<gpu::IndexBuf **>(
-      MEM_callocN(sizeof(*cache->tris_per_mat) * cache->mat_len, __func__));
+  cache->surface_per_mat = Array<gpu::Batch *>(cache->mat_len, nullptr);
+  cache->tris_per_mat = Array<gpu::IndexBuf *>(cache->mat_len, nullptr);
 
   cache->is_dirty = false;
   cache->batch_ready = (DRWBatchFlag)0;
@@ -817,7 +815,7 @@ static void mesh_batch_cache_clear(MeshBatchCache &cache)
   for (int i = 0; i < cache.mat_len; i++) {
     GPU_INDEXBUF_DISCARD_SAFE(cache.tris_per_mat[i]);
   }
-  MEM_SAFE_FREE(cache.tris_per_mat);
+  cache.tris_per_mat = {};
 
   for (int i = 0; i < sizeof(cache.batch) / sizeof(void *); i++) {
     gpu::Batch **batch = (gpu::Batch **)&cache.batch;
@@ -826,7 +824,7 @@ static void mesh_batch_cache_clear(MeshBatchCache &cache)
 
   mesh_batch_cache_discard_shaded_tri(cache);
   mesh_batch_cache_discard_uvedit(cache);
-  MEM_SAFE_FREE(cache.surface_per_mat);
+  cache.surface_per_mat = {};
   cache.mat_len = 0;
 
   cache.batch_ready = (DRWBatchFlag)0;
@@ -989,7 +987,7 @@ gpu::Batch **DRW_mesh_batch_cache_get_surface_shaded(Object *object,
   mesh_cd_layers_type_merge(&cache.cd_needed, cd_needed);
   drw_attributes_merge(&cache.attr_needed, &attrs_needed, mesh->runtime->render_mutex);
   mesh_batch_cache_request_surface_batches(cache);
-  return cache.surface_per_mat;
+  return cache.surface_per_mat.data();
 }
 
 gpu::Batch **DRW_mesh_batch_cache_get_surface_texpaint(Object *object, Mesh *mesh)
@@ -997,7 +995,7 @@ gpu::Batch **DRW_mesh_batch_cache_get_surface_texpaint(Object *object, Mesh *mes
   MeshBatchCache &cache = *mesh_batch_cache_get(mesh);
   texpaint_request_active_uv(cache, object, mesh);
   mesh_batch_cache_request_surface_batches(cache);
-  return cache.surface_per_mat;
+  return cache.surface_per_mat.data();
 }
 
 gpu::Batch *DRW_mesh_batch_cache_get_surface_texpaint_single(Object *object, Mesh *mesh)
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc
index 72875d1bc48..717ae294cf5 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc
@@ -125,7 +125,7 @@ void extract_tris(const MeshRenderData &mr,
     extract_tris_bmesh(mr, face_sorted, ibo);
   }
 
-  if (mr.use_final_mesh && cache.tris_per_mat) {
+  if (mr.use_final_mesh && !cache.tris_per_mat.is_empty()) {
     create_material_subranges(mr, face_sorted, cache, ibo);
   }
 }
@@ -137,7 +137,7 @@ void extract_tris_subdiv(const DRWSubdivCache &subdiv_cache,
   /* Initialize the index buffer, it was already allocated, it will be filled on the device. */
   GPU_indexbuf_init_build_on_device(&ibo, subdiv_cache.num_subdiv_triangles * 3);
 
-  if (cache.tris_per_mat) {
+  if (!cache.tris_per_mat.is_empty()) {
     for (int i = 0; i < cache.mat_len; i++) {
       if (cache.tris_per_mat[i] == nullptr) {
         cache.tris_per_mat[i] = GPU_indexbuf_calloc();