diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index 5f04be85e..c54175cfc 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -2014,7 +2014,7 @@ struct cmap
 
   struct accelerator_t
   {
-    using cache_t = hb_cache_t<21, 19, 8, true>;
+    using cache_t = hb_cache_t<21, 19>;
     static_assert (sizeof (cache_t) == 1024, "");
 
     accelerator_t (hb_face_t *face)
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index ddc1e5a56..07ffa52a4 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -61,7 +61,7 @@
  * never need to call these functions directly.
  **/
 
-using hb_ot_font_advance_cache_t = hb_cache_t<24, 16, 8, true>;
+using hb_ot_font_advance_cache_t = hb_cache_t<24, 16>;
 static_assert (sizeof (hb_ot_font_advance_cache_t) == 1024, "");
 
 struct hb_ot_font_t