diff --git a/mysql-test/main/analyze_format_json.result b/mysql-test/main/analyze_format_json.result
index 1c76fa4971c..8a967186180 100644
--- a/mysql-test/main/analyze_format_json.result
+++ b/mysql-test/main/analyze_format_json.result
@@ -1000,7 +1000,7 @@ ANALYZE
             ],
             "subqueries": [
               {
-                "expression_cache": {
+                "subquery_cache": {
                   "state": "uninitialized",
                   "r_loops": 0,
                   "query_block": {
@@ -1098,7 +1098,7 @@ ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "r_loops": 0,
           "query_block": {
diff --git a/mysql-test/main/explain_json.result b/mysql-test/main/explain_json.result
index 195528577a3..9260b80f916 100644
--- a/mysql-test/main/explain_json.result
+++ b/mysql-test/main/explain_json.result
@@ -404,7 +404,7 @@ EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "select_id": 2,
@@ -451,7 +451,7 @@ EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "select_id": 2,
@@ -2112,7 +2112,7 @@ EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "select_id": 2,
diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result
index ba96d3c0974..b8e125ad731 100644
--- a/mysql-test/main/order_by.result
+++ b/mysql-test/main/order_by.result
@@ -4523,7 +4523,7 @@ ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 50,
           "r_hit_ratio": 0,
           "query_block": {
diff --git a/mysql-test/main/show_analyze_json.result b/mysql-test/main/show_analyze_json.result
index 66b94a6b383..d528f6086c0 100644
--- a/mysql-test/main/show_analyze_json.result
+++ b/mysql-test/main/show_analyze_json.result
@@ -638,7 +638,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "r_loops": 0,
           "query_block": {
@@ -707,7 +707,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 2,
           "r_hit_ratio": 0,
           "query_block": {
@@ -781,7 +781,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 2,
           "r_hit_ratio": 0,
           "query_block": {
@@ -1077,7 +1077,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 1,
           "r_hit_ratio": 0,
           "query_block": {
@@ -1135,7 +1135,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 2,
           "r_hit_ratio": 0,
           "query_block": {
@@ -1194,7 +1194,7 @@ SHOW ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 3,
           "r_hit_ratio": 0,
           "query_block": {
diff --git a/mysql-test/main/show_explain_json.result b/mysql-test/main/show_explain_json.result
index 1768406c371..35ba28b5e3f 100644
--- a/mysql-test/main/show_explain_json.result
+++ b/mysql-test/main/show_explain_json.result
@@ -421,7 +421,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -476,7 +476,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -531,7 +531,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -942,7 +942,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -987,7 +987,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -1032,7 +1032,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -1092,7 +1092,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -1137,7 +1137,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
@@ -1182,7 +1182,7 @@ SHOW EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "query_block": {
             "select_id": 2,
             "cost": "COST_REPLACED",
diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result
index 6924b1973f7..371091d4dfe 100644
--- a/mysql-test/main/subselect4.result
+++ b/mysql-test/main/subselect4.result
@@ -2911,7 +2911,7 @@ ANALYZE
         ],
         "subqueries": [
           {
-            "expression_cache": {
+            "subquery_cache": {
               "state": "disabled",
               "r_loops": 0,
               "query_block": {
diff --git a/mysql-test/main/subselect_cache.result b/mysql-test/main/subselect_cache.result
index 97c4ef04a11..701a3dca3ad 100644
--- a/mysql-test/main/subselect_cache.result
+++ b/mysql-test/main/subselect_cache.result
@@ -72,7 +72,7 @@ ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 10,
           "r_hit_ratio": 60,
           "query_block": {
@@ -137,7 +137,7 @@ ANALYZE
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 10,
           "r_hit_ratio": 60,
           "query_block": {
@@ -189,7 +189,7 @@ ANALYZE
         }
       },
       {
-        "expression_cache": {
+        "subquery_cache": {
           "r_loops": 10,
           "r_hit_ratio": 60,
           "query_block": {
@@ -243,7 +243,7 @@ EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "select_id": 2,
@@ -288,7 +288,7 @@ EXPLAIN
     ],
     "subqueries": [
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "union_result": {
@@ -329,7 +329,7 @@ EXPLAIN
         }
       },
       {
-        "expression_cache": {
+        "subquery_cache": {
           "state": "uninitialized",
           "query_block": {
             "select_id": 2,
diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc
index 5eb0030603f..aafccdac447 100644
--- a/sql/sql_explain.cc
+++ b/sql/sql_explain.cc
@@ -967,7 +967,7 @@ bool Explain_node::print_explain_json_cache(Json_writer *writer,
   if (cache_tracker)
   {
     cache_tracker->fetch_current_stats();
-    writer->add_member("expression_cache").start_object();
+    writer->add_member("subquery_cache").start_object();
     if (cache_tracker->state != Expression_cache_tracker::OK)
     {
       writer->add_member("state").