From 28684dc36b3015ce943435b7e1403c80c69f729c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:04:25 +0300
Subject: [PATCH 1/2] [CLEANUP] Remove EMBER_CACHE_API feature flag

---
 packages/@ember/canary-features/index.ts | 2 --
 packages/ember/index.js                  | 9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 8e2b946bf26..364e152ed03 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -18,7 +18,6 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: null,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
-  EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
@@ -78,7 +77,6 @@ export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );
 export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
-export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 488a3a1cdcc..791aeb0f3ec 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -13,7 +13,6 @@ import {
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-  EMBER_CACHE_API,
   EMBER_DESTROYABLES,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
@@ -351,11 +350,9 @@ Ember.observer = metal.observer;
 Ember.mixin = metal.mixin;
 Ember.Mixin = metal.Mixin;
 
-if (EMBER_CACHE_API) {
-  Ember._createCache = metal.createCache;
-  Ember._cacheGetValue = metal.getValue;
-  Ember._cacheIsConst = metal.isConst;
-}
+Ember._createCache = metal.createCache;
+Ember._cacheGetValue = metal.getValue;
+Ember._cacheIsConst = metal.isConst;
 
 if (EMBER_DESTROYABLES) {
   Ember._registerDestructor = registerDestructor;

From 019ae7b69bfa83edceab2b2a7045b815068966f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:42:17 +0300
Subject: [PATCH 2/2] [CLEANUP] Remove EMBER_CACHE_API feature flag from
 documentation

---
 packages/@ember/-internals/metal/lib/cache.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cache.ts b/packages/@ember/-internals/metal/lib/cache.ts
index 4f1826fd9b3..afc7080c6ca 100644
--- a/packages/@ember/-internals/metal/lib/cache.ts
+++ b/packages/@ember/-internals/metal/lib/cache.ts
@@ -8,7 +8,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   updated.
 
   @module @glimmer/tracking/primitives/cache
-  @category EMBER_CACHE_API
   @public
 */
 
@@ -49,7 +48,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   ```
 
   @method createCache
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public
@@ -72,7 +70,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   ```
 
   @method getValue
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public
@@ -120,7 +117,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   accident.
 
   @method isConst
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public