diff --git a/source/blender/editors/transform/transform_snap_object.hh b/source/blender/editors/transform/transform_snap_object.hh
index 0502a5bdf21..a5fb9b9bc70 100644
--- a/source/blender/editors/transform/transform_snap_object.hh
+++ b/source/blender/editors/transform/transform_snap_object.hh
@@ -19,7 +19,10 @@ struct SnapCache_EditMesh;
 struct SnapObjectContext {
   struct Scene *scene;
 
-  blender::Map<const BMEditMesh *, std::unique_ptr<SnapCache_EditMesh>> editmesh_caches;
+  struct SnapCache {
+    virtual ~SnapCache(){};
+  };
+  blender::Map<const BMEditMesh *, std::unique_ptr<SnapCache>> editmesh_caches;
 
   /* Filter data, returns true to check this value */
   struct {
@@ -185,29 +188,6 @@ eSnapMode snapCurve(SnapObjectContext *sctx, Object *ob_eval, const float obmat[
 
 /* transform_snap_object_editmesh.cc */
 
-struct SnapCache_EditMesh {
-  /* Loose Verts, Edges. */
-  BVHTree *bvhtree[2];
-  bool cached[2];
-
-  /* BVH tree from #BMEditMesh.looptris. */
-  BVHTreeFromEditMesh treedata_editmesh;
-
-  blender::bke::MeshRuntime *mesh_runtime;
-  float min[3], max[3];
-
-  void clear();
-
-  ~SnapCache_EditMesh()
-  {
-    this->clear();
-  }
-
-#ifdef WITH_CXX_GUARDEDALLOC
-  MEM_CXX_CLASS_ALLOC_FUNCS("SnapData_EditMesh")
-#endif
-};
-
 eSnapMode snap_object_editmesh(SnapObjectContext *sctx,
                                Object *ob_eval,
                                const ID *id,
diff --git a/source/blender/editors/transform/transform_snap_object_editmesh.cc b/source/blender/editors/transform/transform_snap_object_editmesh.cc
index 4b8e367180a..d428b1c57dc 100644
--- a/source/blender/editors/transform/transform_snap_object_editmesh.cc
+++ b/source/blender/editors/transform/transform_snap_object_editmesh.cc
@@ -27,16 +27,37 @@ using namespace blender;
 /** \name Snap Object Data
  * \{ */
 
-void SnapCache_EditMesh::clear()
-{
-  for (int i = 0; i < ARRAY_SIZE(this->bvhtree); i++) {
-    if (!this->cached[i]) {
-      BLI_bvhtree_free(this->bvhtree[i]);
+struct SnapCache_EditMesh : public SnapObjectContext::SnapCache {
+  /* Loose Verts, Edges. */
+  BVHTree *bvhtree[2];
+  bool cached[2];
+
+  /* BVH tree from #BMEditMesh.looptris. */
+  BVHTreeFromEditMesh treedata_editmesh;
+
+  blender::bke::MeshRuntime *mesh_runtime;
+  float min[3], max[3];
+
+  void clear()
+  {
+    for (int i = 0; i < ARRAY_SIZE(this->bvhtree); i++) {
+      if (!this->cached[i]) {
+        BLI_bvhtree_free(this->bvhtree[i]);
+      }
+      this->bvhtree[i] = nullptr;
     }
-    this->bvhtree[i] = nullptr;
+    free_bvhtree_from_editmesh(&this->treedata_editmesh);
   }
-  free_bvhtree_from_editmesh(&this->treedata_editmesh);
-}
+
+  ~SnapCache_EditMesh()
+  {
+    this->clear();
+  }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+  MEM_CXX_CLASS_ALLOC_FUNCS("SnapData_EditMesh")
+#endif
+};
 
 /**
  * Calculate the minimum and maximum coordinates of the box that encompasses this mesh.
@@ -85,8 +106,10 @@ static SnapCache_EditMesh *snap_object_data_editmesh_get(SnapObjectContext *sctx
   SnapCache_EditMesh *em_cache = nullptr;
   bool init = false;
 
-  if (std::unique_ptr<SnapCache_EditMesh> *em_cache_p = sctx->editmesh_caches.lookup_ptr(em)) {
-    em_cache = em_cache_p->get();
+  if (std::unique_ptr<SnapObjectContext::SnapCache> *em_cache_p = sctx->editmesh_caches.lookup_ptr(
+          em))
+  {
+    em_cache = static_cast<SnapCache_EditMesh *>(em_cache_p->get());
     bool is_dirty = false;
     /* Check if the geometry has changed. */
     if (em_cache->treedata_editmesh.em != em) {