diff --git a/purgely.php b/purgely.php
index 80e1308..0b8be16 100644
--- a/purgely.php
+++ b/purgely.php
@@ -132,6 +132,8 @@ class Purgely
      */
     var $service_name = '';
 
+	var $query = null;
+
     /**
      * Instantiate or return the one Purgely instance.
      *
@@ -210,6 +212,7 @@ public function __construct()
 
         // Add the surrogate keys.
         add_action('wp', array($this, 'set_standard_keys'), 100);
+        add_filter('rest_post_dispatch', array($this, 'keys_for_rest_api'), 100, 20);
 
         // Send the surrogate keys.
         add_action('wp', array($this, 'send_surrogate_keys'), 101);
@@ -263,7 +266,7 @@ public function set_standard_keys()
         }
 
         global $wp_query;
-        $key_collection = new Purgely_Surrogate_Key_Collection($wp_query);
+        $key_collection = new Purgely_Surrogate_Key_Collection($this->query ?? $wp_query);
 
         $this::$surrogate_keys_collection = $key_collection;
 
@@ -581,6 +584,70 @@ public function enqueue_admin_script_edgemodules($hook)
         wp_enqueue_script( 'fastly_edgemodules_handlebars_library', plugin_dir_url( __FILE__ ) . 'js/handlebars-v4.0.12.js', array(), '1.0' );
         wp_enqueue_script( 'fastly_edgemodules_script', plugin_dir_url( __FILE__ ) . 'js/edgemodules.js', array(), '1.0' );
     }
+
+	public function keys_for_rest_api($response) {
+
+		$responseData = $response->get_data();
+
+		if ( empty( $responseData['id'] ) ) {
+			return $response;
+		}
+
+		if ( isset( $responseData['taxonomy'] ) && $responseData['taxonomy'] === 'category') {
+			$category = get_category( $responseData['id'] );
+			$type = 'post-category';
+			$name = $category->slug ?? '';
+		} else if ( str_contains($response->get_matched_route(), 'products/categories') ) {
+			$type = 'product-category';
+			$name = $responseData['slug'] ?? '';
+		} else {
+			$postInfo = get_post( $responseData['id'] );
+			$type = $postInfo->post_type ?? '';
+			$name = $postInfo->post_name ?? '';
+		}
+
+		if ( empty( $type ) || empty( $name ) ) {
+			return $response;
+		}
+
+		if ( $type === 'page' ) {
+			$query = new WP_Query([
+				'page' => '',
+				'pagename' => $name
+			]);
+		} else if ( $type === 'post' ) {
+			$query = new WP_Query([
+				'page' => '',
+				'name' => $name
+			]);
+		} else if ( $type === 'post-category' ) {
+			$query = new WP_Query([
+				'category_name' => $name,
+			]);
+			$query->queried_object = $category;
+		} else if ( $type === 'product' ) {
+			$query = new WP_Query( [
+				'page' => '',
+				'post_type' => 'product',
+				'product' => $name,
+				'name' => $name
+			]);
+		} else if ( $type === 'product-category' ) {
+			$query = new WP_Query([
+				'product_cat' => $name,
+			]);
+		} else {
+			return $response;
+		}
+
+		$this->query = $query;
+		$this->set_standard_keys();
+		$this->send_surrogate_keys();
+		$this->send_surrogate_control();
+		$this->send_cache_control();
+
+		return $response;
+	}
 }
 
 /**
diff --git a/src/classes/surrogate-key-collection.php b/src/classes/surrogate-key-collection.php
index 960d628..1c67b7a 100644
--- a/src/classes/surrogate-key-collection.php
+++ b/src/classes/surrogate-key-collection.php
@@ -85,7 +85,7 @@ public function __construct($wp_query)
 
         } else {
             if ($wp_query->is_category() || $wp_query->is_tag() || $wp_query->is_tax()) {
-                $term_keys = $this->_add_key_terms_taxonomy();
+                $term_keys = $this->_add_key_terms_taxonomy( $wp_query );
             }
         }
 
@@ -208,16 +208,18 @@ private function _add_key_terms_single($post_id, $taxonomy)
         return $keys;
     }
 
-    /**
-     * Get the term keys for taxonomies.
-     *
-     * @return array The taxonomy combos for the post.
-     */
-    private function _add_key_terms_taxonomy()
+	/**
+	 * Get the term keys for taxonomies.
+	 *
+	 * @param $wp_query
+	 *
+	 * @return array The taxonomy combos for the post.
+	 */
+    private function _add_key_terms_taxonomy( $wp_query )
     {
         $keys = array();
 
-        $queried_object = get_queried_object();
+        $queried_object = $wp_query->get_queried_object();
         // archive page? author page? single post?
 
         if (!empty($queried_object->term_id) && !empty($queried_object->taxonomy)) {