diff --git a/addon/controllers/products/index/category/new.js b/addon/controllers/products/index/category/new.js
index 1e6878f..9cda403 100644
--- a/addon/controllers/products/index/category/new.js
+++ b/addon/controllers/products/index/category/new.js
@@ -40,6 +40,15 @@ export default class ProductsIndexCategoryNewController extends BaseController {
         return this.productsIndexCategoryController?.category ?? null;
     }
 
+    get variantTabs() {
+        const variants = this.product.variants ?? [];
+        return variants.map((v) => ({
+            label: v.name,
+            id: v.public_id ?? v.name,
+            variant: v,
+        }));
+    }
+
     /** overlay options */
     @tracked overlayTitle = 'New Product';
     @tracked overlayActionButtonTitle = 'Create Product';
@@ -117,6 +126,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
                 subject_uuid: this.product.id,
                 subject_type: 'storefront:product',
                 type: 'storefront_product',
+                resize: 'md',
             },
             (uploadedFile) => {
                 this.product.files.pushObject(uploadedFile);
diff --git a/addon/templates/products/index/category/new.hbs b/addon/templates/products/index/category/new.hbs
index 8990c83..c9624c9 100644
--- a/addon/templates/products/index/category/new.hbs
+++ b/addon/templates/products/index/category/new.hbs
@@ -100,25 +100,6 @@
                 <div>
                     <MetadataEditor @value={{this.product.meta}} @onChange={{fn (mut this.product.meta)}} />
                 </div>
-                {{!-- {{#each this.product.meta_array as |metaField index|}}
-                    <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
-                        <div class="input-group">
-                            <div class="flex justify-between items-center mb-1">
-                                <Input
-                                    class="form-input border-0 px-2 py-1 m-0 bg-white dark:bg-gray-900 shadow-none"
-                                    @value={{metaField.label}}
-                                    disabled={{unauthorized}}
-                                    placeholder={{metaField.label}}
-                                />
-                                <a href="javascript:;" class="text-xs" tabindex="-1" disabled={{unauthorized}} {{on "click" (fn this.removeMetaField index)}}>
-                                    <FaIcon @icon="trash" @size="sm" class="mr-1" />
-                                    Remove
-                                </a>
-                            </div>
-                            <Input class="w-full form-input" @value={{metaField.value}} placeholder={{metaField.label}} disabled={{unauthorized}} />
-                        </div>
-                    </div>
-                {{/each}} --}}
             </ContentPanel>
 
             <InputGroup>
@@ -130,7 +111,7 @@
                 />
             </InputGroup>
 
-            <div class="store-boolean-settings">
+            <div class="store-boolean-settings mb-4">
                 <div class="input-group mb-0">
                     <Checkbox @value={{this.product.is_service}} @onToggle={{fn (mut this.product.is_service)}} @disabled={{unauthorized}}>
                         <FaIcon @icon="house-leave" class="text-indigo-400 mx-2" /><span class="dark:text-gray-100 text-sm">This is a service</span>
@@ -164,18 +145,19 @@
                 </div>
             </div>
 
-            <ContentPanel @title="Variants" @open={{true}} @wrapperClass="bordered-top">
-                <div class="flex items-center justify-end">
-                    <Button @text="New Variant" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} @permission="storefront create product-variant" />
-                </div>
-                <Tabs class="overlay-content-panel" as |Tab|>
-                    {{#each this.product.variants as |variant|}}
-                        <Tab @title={{variant.name}}>
+            <ContentPanel @title="Variants" @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="px-0i">
+                <TabNavigation @tabs={{this.variantTabs}}>
+                    <:actions>
+                        <Button @text="New Variant" @size="xs" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} @permission="storefront create product-variant" />
+                    </:actions>
+                    <:default as |activeTab|>
+                        {{#let activeTab.variant as |variant|}}
                             <div class="px-4 py-3">
                                 <div class="flex items-center justify-end mb-3">
                                     <Button
                                         class="mr-2"
                                         @type="danger"
+                                        @size="xs"
                                         @text="Remove Variant"
                                         @icon="trash"
                                         @onClick={{fn this.removeProductVariant variant}}
@@ -184,6 +166,7 @@
                                     <Button
                                         class="mr-2"
                                         @type="warning"
+                                        @size="xs"
                                         @text="Edit Variant"
                                         @icon="pencil"
                                         @onClick={{fn this.editProductVariant variant}}
@@ -192,6 +175,7 @@
                                     <Button
                                         @text={{concat "New " (lowercase variant.name) " option"}}
                                         @icon="plus"
+                                        @size="xs"
                                         @iconPrefix="fas"
                                         @onClick={{fn this.addVariantOption variant}}
                                         @permission="storefront create product-variant-option"
@@ -238,9 +222,9 @@
                                     {{/each}}
                                 </div>
                             </div>
-                        </Tab>
-                    {{/each}}
-                </Tabs>
+                        {{/let}}
+                    </:default>
+                </TabNavigation>
             </ContentPanel>
 
             <ContentPanel @title="Add-Ons" @open={{true}} @wrapperClass="bordered-top">
@@ -248,6 +232,7 @@
                     <Button
                         @text="Select Addon Categories"
                         @icon="plus"
+                        @size="xs"
                         @iconPrefix="fas"
                         @onClick={{perform this.promptSelectAddonCategories}}
                         @permission="storefront list product-addon"
diff --git a/composer.json b/composer.json
index 6f460bc..4b71169 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.4.9",
+    "version": "0.4.10",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
diff --git a/extension.json b/extension.json
index 506053e..a537588 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.4.9",
+    "version": "0.4.10",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
index a6fdc96..d55f5e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.4.9",
+    "version": "0.4.10",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -44,9 +44,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.8",
-        "@fleetbase/ember-ui": "^0.3.14",
-        "@fleetbase/fleetops-data": "^0.1.23",
+        "@fleetbase/ember-core": "^0.3.9",
+        "@fleetbase/ember-ui": "^0.3.15",
+        "@fleetbase/fleetops-data": "^0.1.24",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4e383fd..1f17ac5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,14 +12,14 @@ importers:
         specifier: ^7.23.2
         version: 7.25.2
       '@fleetbase/ember-core':
-        specifier: ^0.3.8
-        version: 0.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
+        specifier: ^0.3.9
+        version: 0.3.9(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
       '@fleetbase/ember-ui':
-        specifier: ^0.3.14
-        version: 0.3.14(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.4.0(@babel/core@7.25.2))(webpack@5.94.0)
+        specifier: ^0.3.15
+        version: 0.3.15(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.4.0(@babel/core@7.25.2))(webpack@5.94.0)
       '@fleetbase/fleetops-data':
-        specifier: ^0.1.23
-        version: 0.1.23(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
+        specifier: ^0.1.24
+        version: 0.1.24(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
       '@fortawesome/ember-fontawesome':
         specifier: ^2.0.0
         version: 2.0.0(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(rollup@2.79.1)(webpack@5.94.0)
@@ -1864,16 +1864,16 @@ packages:
     peerDependencies:
       ember-source: '>= 4.0.0'
 
-  '@fleetbase/ember-core@0.3.8':
-    resolution: {integrity: sha512-lakUs/gG8k4GbJprXlrz1KIZDr5254qjVfhXU5kcaKyS9VBzgsNsWKXIA8+821lcwufGIlioE12D4+qEb4GZNA==}
+  '@fleetbase/ember-core@0.3.9':
+    resolution: {integrity: sha512-CxMEyNGhSk0u8SkI6GZiKY2W/246PyBpY6clZahoxtyokL76kWx2KjEk4iXqKdhKKU5a5OKlS8Kw9wb0peZZzw==}
     engines: {node: '>= 18'}
 
-  '@fleetbase/ember-ui@0.3.14':
-    resolution: {integrity: sha512-w0IcDsANw3Vmi/ha1a6fHexIV2beb3wupB9j3dNs43lvQp6D+zoAtMrW9q6DD6ICNCbxikmD0AMUIbjO5gJYDg==}
+  '@fleetbase/ember-ui@0.3.15':
+    resolution: {integrity: sha512-eKzaUyTUa6Fp8seRS0dB/6+tf///YVMx8MvuJPQoKBupxmQ7i+D6iehu6KBrbDRfoHVWRL6/44WmoTZoDzDQRA==}
     engines: {node: '>= 18'}
 
-  '@fleetbase/fleetops-data@0.1.23':
-    resolution: {integrity: sha512-x4Vl+FcN+wXkFAK6mQ5eBpCVDcYhF46bSEEDb2oMZcxbFrZ7M2QXlqankmoU+JsvE1r/gkuDmbcxa61FTKlb9A==}
+  '@fleetbase/fleetops-data@0.1.24':
+    resolution: {integrity: sha512-cSK4FXIIO7yidQ6j44oZzmHt1vlTinz3RMvK0vYrXoKehKWy/8LDsT+lrfCEeGeYB0sTnVfnNsSZVkUPLsMxPg==}
     engines: {node: '>= 18'}
 
   '@fleetbase/intl-lint@0.0.1':
@@ -12076,7 +12076,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@fleetbase/ember-core@0.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)':
+  '@fleetbase/ember-core@0.3.9(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)':
     dependencies:
       '@babel/core': 7.25.2
       compress-json: 3.4.0
@@ -12109,7 +12109,7 @@ snapshots:
       - utf-8-validate
       - webpack
 
-  '@fleetbase/ember-ui@0.3.14(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.4.0(@babel/core@7.25.2))(webpack@5.94.0)':
+  '@fleetbase/ember-ui@0.3.15(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.4.0(@babel/core@7.25.2))(webpack@5.94.0)':
     dependencies:
       '@babel/core': 7.25.2
       '@ember/render-modifiers': 2.1.0(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))
@@ -12212,10 +12212,10 @@ snapshots:
       - webpack-command
       - yaml
 
-  '@fleetbase/fleetops-data@0.1.23(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)':
+  '@fleetbase/fleetops-data@0.1.24(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)':
     dependencies:
       '@babel/core': 7.25.2
-      '@fleetbase/ember-core': 0.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
+      '@fleetbase/ember-core': 0.3.9(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(eslint@8.57.0)(webpack@5.94.0)
       date-fns: 2.30.0
       ember-cli-babel: 8.2.0(@babel/core@7.25.2)
       ember-cli-htmlbars: 6.3.0
diff --git a/server/src/Http/Controllers/v1/CatalogController.php b/server/src/Http/Controllers/v1/CatalogController.php
index 415333d..82bad65 100644
--- a/server/src/Http/Controllers/v1/CatalogController.php
+++ b/server/src/Http/Controllers/v1/CatalogController.php
@@ -20,7 +20,7 @@ public function query(Request $request)
         $results = [];
 
         if (session('storefront_store')) {
-            $results = Catalog::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+            $results = Catalog::queryWithRequestCached($request, function (&$query) use ($limit, $offset) {
                 $query->where('subject_uuid', session('storefront_store'));
 
                 if ($limit) {
diff --git a/server/src/Http/Controllers/v1/CategoryController.php b/server/src/Http/Controllers/v1/CategoryController.php
index 8a81bec..54d7ae7 100644
--- a/server/src/Http/Controllers/v1/CategoryController.php
+++ b/server/src/Http/Controllers/v1/CategoryController.php
@@ -23,7 +23,7 @@ public function query(Request $request)
         $results = [];
 
         if (session('storefront_store')) {
-            $results = Category::queryWithRequest($request, function (&$query) use ($request) {
+            $results = Category::queryWithRequestCached($request, function (&$query) use ($request) {
                 $query->select([DB::raw('public_id as id'), 'public_id', 'uuid', 'parent_uuid', 'icon_file_uuid', 'name', 'description', 'tags', 'translations', 'icon', 'slug', 'created_at'])->where(['owner_uuid' => session('storefront_store'), 'for' => 'storefront_product']);
 
                 // only parent categories
@@ -67,7 +67,7 @@ public function query(Request $request)
                 })->first();
 
                 if ($store) {
-                    $results = Category::queryWithRequest($request, function (&$query) use ($store, $request) {
+                    $results = Category::queryWithRequestCached($request, function (&$query) use ($store, $request) {
                         $query->select([DB::raw('public_id as id'), 'public_id', 'uuid', 'parent_uuid', 'icon_file_uuid', 'name', 'icon', 'description', 'tags', 'translations', 'slug', 'created_at'])->where(['owner_uuid' => $store->uuid, 'for' => 'storefront_product']);
 
                         // only parent categories
@@ -102,7 +102,7 @@ public function query(Request $request)
                     }
                 }
             } else {
-                $results = Category::queryWithRequest($request, function (&$query) use ($request) {
+                $results = Category::queryWithRequestCached($request, function (&$query) use ($request) {
                     $query->select([DB::raw('public_id as id'), 'public_id', 'uuid', 'parent_uuid', 'name', 'icon', 'description', 'tags', 'translations', 'slug', 'created_at'])->where(['owner_uuid' => session('storefront_network'), 'for' => 'storefront_network']);
 
                     // only parent categories
diff --git a/server/src/Http/Controllers/v1/CustomerController.php b/server/src/Http/Controllers/v1/CustomerController.php
index b976069..37774c0 100644
--- a/server/src/Http/Controllers/v1/CustomerController.php
+++ b/server/src/Http/Controllers/v1/CustomerController.php
@@ -74,7 +74,7 @@ public function orders(Request $request)
             return response()->apiError('Not authorized to view customers orders');
         }
 
-        $results = Order::queryWithRequest($request, function (&$query) use ($customer) {
+        $results = Order::queryWithRequestCached($request, function (&$query) use ($customer) {
             $query->where('customer_uuid', $customer->uuid)->whereNull('deleted_at')->withoutGlobalScopes();
 
             // dont query any master orders if its a network
@@ -102,7 +102,7 @@ public function places(Request $request)
             return response()->apiError('Not authorized to view customers places');
         }
 
-        $results = Place::queryWithRequest($request, function (&$query) use ($customer) {
+        $results = Place::queryWithRequestCached($request, function (&$query) use ($customer) {
             $query->where('owner_uuid', $customer->uuid);
         });
 
@@ -341,7 +341,7 @@ public function update($id, UpdateContactRequest $request)
      */
     public function query(Request $request)
     {
-        $results = Contact::queryWithRequest($request, function (&$query, $request) {
+        $results = Contact::queryWithRequestCached($request, function (&$query, $request) {
             $query->where(['type' => 'customer', 'company_uuid' => session('company')]);
         });
 
diff --git a/server/src/Http/Controllers/v1/FoodTruckController.php b/server/src/Http/Controllers/v1/FoodTruckController.php
index 1d31e17..be35a80 100644
--- a/server/src/Http/Controllers/v1/FoodTruckController.php
+++ b/server/src/Http/Controllers/v1/FoodTruckController.php
@@ -22,7 +22,7 @@ public function query(Request $request)
         $results = [];
 
         if (session('storefront_store')) {
-            $results = FoodTruck::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+            $results = FoodTruck::queryWithRequestCached($request, function (&$query) use ($limit, $offset) {
                 $query->where('store_uuid', session('storefront_store'));
 
                 if ($limit) {
diff --git a/server/src/Http/Controllers/v1/ProductController.php b/server/src/Http/Controllers/v1/ProductController.php
index 1dfb5b1..ce1c2b9 100644
--- a/server/src/Http/Controllers/v1/ProductController.php
+++ b/server/src/Http/Controllers/v1/ProductController.php
@@ -327,7 +327,7 @@ public function update($id, UpdateProductRequest $request)
      */
     public function query(Request $request)
     {
-        $results = Product::queryWithRequest($request, function (&$query, $request) {
+        $results = Product::queryWithRequestCached($request, function (&$query, $request) {
             // for stores
             if (session('storefront_store')) {
                 $query->where(['store_uuid' => session('storefront_store')]);
diff --git a/server/src/Http/Controllers/v1/ReviewController.php b/server/src/Http/Controllers/v1/ReviewController.php
index c36abe0..bdc4f76 100644
--- a/server/src/Http/Controllers/v1/ReviewController.php
+++ b/server/src/Http/Controllers/v1/ReviewController.php
@@ -33,7 +33,7 @@ public function query(Request $request)
         }
 
         if (session('storefront_store')) {
-            $results = Review::queryWithRequest($request, function (&$query) use ($limit, $offset) {
+            $results = Review::queryWithRequestCached($request, function (&$query) use ($limit, $offset) {
                 $query->where('subject_uuid', session('storefront_store'));
 
                 if ($limit) {
@@ -59,7 +59,7 @@ public function query(Request $request)
                     return response()->json(['error' => 'Cannot find reviews for store'], 400);
                 }
 
-                $results = Review::queryWithRequest($request, function (&$query) use ($store, $limit, $offset) {
+                $results = Review::queryWithRequestCached($request, function (&$query) use ($store, $limit, $offset) {
                     $query->where('subject_uuid', $store->uuid);
 
                     if ($limit) {
diff --git a/server/src/Http/Controllers/v1/ServiceQuoteController.php b/server/src/Http/Controllers/v1/ServiceQuoteController.php
index 74ea0c4..9c3f9b7 100644
--- a/server/src/Http/Controllers/v1/ServiceQuoteController.php
+++ b/server/src/Http/Controllers/v1/ServiceQuoteController.php
@@ -5,7 +5,6 @@
 use Fleetbase\FleetOps\Http\Resources\v1\ServiceQuote as ServiceQuoteResource;
 use Fleetbase\FleetOps\Models\Entity;
 use Fleetbase\FleetOps\Models\IntegratedVendor;
-use Fleetbase\FleetOps\Models\OrderConfig;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\ServiceQuoteItem;
@@ -19,6 +18,7 @@
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
+use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils as CoreUtils;
 use Illuminate\Support\Str;
 
@@ -102,11 +102,11 @@ public function fromCart(GetServiceQuoteFromCart $request)
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfig    = Storefront::getSessionOrderConfig();
         $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
+        $serviceRates = ServiceRate::where(['company_uuid' => session('company'), 'service_type' => $orderConfigKey])->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {
@@ -290,11 +290,11 @@ public function fromCartForNetwork(GetServiceQuoteFromCart $request)
         $serviceQuotes = collect();
 
         // get order configurations for ecommerce / task
-        $orderConfig    = OrderConfig::resolveFromIdentifier($config);
+        $orderConfig    = Storefront::getSessionOrderConfig();
         $orderConfigKey = data_get($orderConfig, 'key', 'storefront');
 
         // get service rates for config type
-        $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get();
+        $serviceRates = ServiceRate::where(['company_uuid' => session('company'), 'service_type' => $orderConfigKey])->get();
 
         // if no service rates send an empty quote
         if ($serviceRates->isEmpty()) {
diff --git a/server/src/Models/Cart.php b/server/src/Models/Cart.php
index c79883f..55fbb3e 100644
--- a/server/src/Models/Cart.php
+++ b/server/src/Models/Cart.php
@@ -8,6 +8,7 @@
 use Fleetbase\Models\User;
 use Fleetbase\Traits\Expirable;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Illuminate\Support\Arr;
@@ -19,6 +20,7 @@ class Cart extends StorefrontModel
     use HasUuid;
     use HasPublicId;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use Expirable;
 
     /**
diff --git a/server/src/Models/Catalog.php b/server/src/Models/Catalog.php
index 9fb03b8..9a0fd31 100644
--- a/server/src/Models/Catalog.php
+++ b/server/src/Models/Catalog.php
@@ -6,6 +6,7 @@
 use Fleetbase\Models\Company;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,6 +18,7 @@ class Catalog extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
 
     /**
      * The type of public ID to generate.
diff --git a/server/src/Models/FoodTruck.php b/server/src/Models/FoodTruck.php
index bf6822e..796b7b1 100644
--- a/server/src/Models/FoodTruck.php
+++ b/server/src/Models/FoodTruck.php
@@ -9,6 +9,7 @@
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Storefront\Http\Resources\FoodTruck as FoodTruckResource;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -22,6 +23,7 @@ class FoodTruck extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use SoftDeletes;
 
     /**
diff --git a/server/src/Models/Network.php b/server/src/Models/Network.php
index 090c1c4..1817417 100644
--- a/server/src/Models/Network.php
+++ b/server/src/Models/Network.php
@@ -13,6 +13,7 @@
 use Fleetbase\Models\User;
 use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasOptionsAttributes;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
@@ -26,6 +27,7 @@ class Network extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasOptionsAttributes;
     use HasSlug;
     use Searchable;
diff --git a/server/src/Models/Product.php b/server/src/Models/Product.php
index 0224bf0..ab0a449 100644
--- a/server/src/Models/Product.php
+++ b/server/src/Models/Product.php
@@ -9,6 +9,7 @@
 use Fleetbase\Models\File;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
@@ -30,6 +31,7 @@ class Product extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasMetaAttributes;
     use HasSlug;
     use Searchable;
diff --git a/server/src/Models/Review.php b/server/src/Models/Review.php
index ae1740e..178efbd 100644
--- a/server/src/Models/Review.php
+++ b/server/src/Models/Review.php
@@ -5,6 +5,7 @@
 use Fleetbase\Models\File;
 use Fleetbase\Models\User;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasPublicid;
 use Fleetbase\Traits\HasUuid;
 
@@ -13,6 +14,7 @@ class Review extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
 
     /**
      * The type of public Id to generate.
diff --git a/server/src/Models/Store.php b/server/src/Models/Store.php
index 02c725c..edfefc3 100644
--- a/server/src/Models/Store.php
+++ b/server/src/Models/Store.php
@@ -13,6 +13,7 @@
 use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils as FleetbaseUtils;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasApiModelCache;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasOptionsAttributes;
 use Fleetbase\Traits\HasPublicid;
@@ -28,6 +29,7 @@ class Store extends StorefrontModel
     use HasUuid;
     use HasPublicid;
     use HasApiModelBehavior;
+    use HasApiModelCache;
     use HasOptionsAttributes;
     use HasMetaAttributes;
     use HasSlug;
diff --git a/server/src/Support/Storefront.php b/server/src/Support/Storefront.php
index 2aa577f..4047616 100644
--- a/server/src/Support/Storefront.php
+++ b/server/src/Support/Storefront.php
@@ -256,6 +256,22 @@ public static function patchOrderConfig($order): ?OrderConfig
         return $orderConfig;
     }
 
+    /**
+     * Get the current store or networks order config.
+     *
+     * @return \Fleetbase\Storefront\Models\OrderConfig|null
+     */
+    public static function getSessionOrderConfig(): ?OrderConfig
+    {
+        if ($about = static::about()) {
+            $about->loadMissing('orderConfig');
+
+            return $about->orderConfig ?? static::getDefaultOrderConfig();
+        }
+
+        return static::getDefaultOrderConfig();
+    }
+
     /**
      * Get the default Storefront OrderConfig for the "current" company context.
      *