diff --git a/CHANGELOG.md b/CHANGELOG.md
index a55db173e..b6353cfc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## v2.0.0-beta.21 (2022-09-06)
+
+#### :rocket: Enhancement
+* `@glimmer/tracking`
+  * [#358](https://github.com/glimmerjs/glimmer.js/pull/358) Adds @cached decorator ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :bug: Bug Fix
+* `@glimmer/component`
+  * [#398](https://github.com/glimmerjs/glimmer.js/pull/398) Fix ExpandSignature & ArgsFor ([@chadhietala](https://github.com/chadhietala))
+
+#### Committers: 2
+- Chad Hietala ([@chadhietala](https://github.com/chadhietala))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## v2.0.0-beta.20 (2022-04-11)
 
 #### :bug: Bug Fix
diff --git a/package.json b/package.json
index 5d074796c..550b7c4e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "glimmer.js",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "repository": {
     "type": "git",
diff --git a/packages/@glimmer/babel-preset/package.json b/packages/@glimmer/babel-preset/package.json
index 4655b2486..1a4183874 100644
--- a/packages/@glimmer/babel-preset/package.json
+++ b/packages/@glimmer/babel-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/babel-preset",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Glimmer.js Babel Preset",
   "repository": "https://github.com/glimmerjs/glimmer.js",
   "author": "Tom Dale <tom@tomdale.net>",
diff --git a/packages/@glimmer/blueprint/files/package.json b/packages/@glimmer/blueprint/files/package.json
index 3c61ba661..2d8300d85 100644
--- a/packages/@glimmer/blueprint/files/package.json
+++ b/packages/@glimmer/blueprint/files/package.json
@@ -18,13 +18,13 @@
     "@babel/core": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-typescript": "^7.9.0",
-    "@glimmer/blueprint": "~2.0.0-beta.20",
-    "@glimmer/component": "~2.0.0-beta.20",
-    "@glimmer/core": "~2.0.0-beta.20",
+    "@glimmer/blueprint": "~2.0.0-beta.21",
+    "@glimmer/component": "~2.0.0-beta.21",
+    "@glimmer/core": "~2.0.0-beta.21",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/helper": "~2.0.0-beta.20",
-    "@glimmer/modifier": "~2.0.0-beta.20",
-    "@glimmer/babel-preset": "~2.0.0-beta.20",
+    "@glimmer/helper": "~2.0.0-beta.21",
+    "@glimmer/modifier": "~2.0.0-beta.21",
+    "@glimmer/babel-preset": "~2.0.0-beta.21",
     "@types/qunit": "^2.9.1",
     "@typescript-eslint/eslint-plugin": "^2.26.0",
     "@typescript-eslint/parser": "^2.26.0",
diff --git a/packages/@glimmer/blueprint/package.json b/packages/@glimmer/blueprint/package.json
index faa64eb89..ce6fbbfe4 100644
--- a/packages/@glimmer/blueprint/package.json
+++ b/packages/@glimmer/blueprint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/blueprint",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Ember CLI blueprint for initializing a new Glimmer application.",
   "main": "index.js",
   "scripts": {
diff --git a/packages/@glimmer/component/package.json b/packages/@glimmer/component/package.json
index 972aa4624..2b05fa18b 100644
--- a/packages/@glimmer/component/package.json
+++ b/packages/@glimmer/component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/component",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Glimmer component library",
   "keywords": [
     "ember-addon"
@@ -26,7 +26,7 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "@glimmer/core": "2.0.0-beta.20",
+    "@glimmer/core": "2.0.0-beta.21",
     "@glimmer/env": "^0.1.7",
     "@glimmer/util": "0.84.0",
     "broccoli-file-creator": "^2.1.1",
@@ -48,7 +48,7 @@
     "@glimmer/compiler": "0.84.0",
     "@glimmer/interfaces": "0.84.0",
     "@glimmer/resolver": "^0.4.3",
-    "@glimmer/tracking": "2.0.0-beta.20",
+    "@glimmer/tracking": "2.0.0-beta.21",
     "@glimmer/wire-format": "0.84.0",
     "@types/ember": "~4.0.0",
     "@types/ember-qunit": "~5.0.0",
diff --git a/packages/@glimmer/core/package.json b/packages/@glimmer/core/package.json
index b1e54c7bf..5c6cccf02 100644
--- a/packages/@glimmer/core/package.json
+++ b/packages/@glimmer/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/core",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Core rendering functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
@@ -25,8 +25,8 @@
   },
   "devDependencies": {
     "@glimmer/compiler": "0.84.0",
-    "@glimmer/component": "2.0.0-beta.20",
-    "@glimmer/tracking": "2.0.0-beta.20"
+    "@glimmer/component": "2.0.0-beta.21",
+    "@glimmer/tracking": "2.0.0-beta.21"
   },
   "volta": {
     "node": "12.16.1",
diff --git a/packages/@glimmer/debug/package.json b/packages/@glimmer/debug/package.json
index f74de44df..1ed57ab8c 100644
--- a/packages/@glimmer/debug/package.json
+++ b/packages/@glimmer/debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/debug",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Debug Functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
diff --git a/packages/@glimmer/helper/package.json b/packages/@glimmer/helper/package.json
index 77032543f..29c66c3a0 100644
--- a/packages/@glimmer/helper/package.json
+++ b/packages/@glimmer/helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/helper",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Helper Functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
@@ -12,8 +12,8 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmer/component": "2.0.0-beta.20",
-    "@glimmer/core": "2.0.0-beta.20",
+    "@glimmer/component": "2.0.0-beta.21",
+    "@glimmer/core": "2.0.0-beta.21",
     "@glimmer/runtime": "0.84.0"
   },
   "volta": {
diff --git a/packages/@glimmer/modifier/package.json b/packages/@glimmer/modifier/package.json
index 0c930957c..ab30e4493 100644
--- a/packages/@glimmer/modifier/package.json
+++ b/packages/@glimmer/modifier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/modifier",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Modifier Functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
diff --git a/packages/@glimmer/ssr/package.json b/packages/@glimmer/ssr/package.json
index aabd7d14f..bf7635b93 100644
--- a/packages/@glimmer/ssr/package.json
+++ b/packages/@glimmer/ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/ssr",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Server-side rendering for Glimmer Applications",
   "repository": "https://github.com/glimmerjs/glimmer.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
   "dependencies": {
-    "@glimmer/core": "2.0.0-beta.20",
+    "@glimmer/core": "2.0.0-beta.21",
     "@glimmer/node": "0.84.0",
     "@glimmer/reference": "0.84.0",
     "@glimmer/runtime": "0.84.0",
@@ -20,7 +20,7 @@
     "@simple-dom/void-map": "^1.4.0"
   },
   "devDependencies": {
-    "@glimmer/component": "2.0.0-beta.20"
+    "@glimmer/component": "2.0.0-beta.21"
   },
   "volta": {
     "node": "12.16.1",
diff --git a/packages/@glimmer/tracking/package.json b/packages/@glimmer/tracking/package.json
index 20678c55e..914573c20 100644
--- a/packages/@glimmer/tracking/package.json
+++ b/packages/@glimmer/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmer/tracking",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Glimmer property tracking library",
   "keywords": [
     "ember-addon"