diff --git a/framework/bigcommerce/provider.tsx b/framework/bigcommerce/provider.tsx
index 0d794edd9..364e87539 100644
--- a/framework/bigcommerce/provider.tsx
+++ b/framework/bigcommerce/provider.tsx
@@ -54,12 +54,11 @@ const useCart: HookHandler<
     url: '/api/bigcommerce/cart',
     method: 'GET',
   },
-  swrOptions: {
-    revalidateOnFocus: false,
-  },
   normalizer: normalizeCart,
   useHook({ input, useData }) {
-    const response = useData({ input })
+    const response = useData({
+      swrOptions: { revalidateOnFocus: false, ...input.swrOptions },
+    })
 
     return useMemo(
       () =>
@@ -74,16 +73,6 @@ const useCart: HookHandler<
       [response]
     )
   },
-  onResponse(response) {
-    return Object.create(response, {
-      isEmpty: {
-        get() {
-          return (response.data?.lineItems.length ?? 0) <= 0
-        },
-        enumerable: true,
-      },
-    })
-  },
 }
 
 const useWishlist: HookHandler<
@@ -98,19 +87,6 @@ const useWishlist: HookHandler<
     url: '/api/bigcommerce/wishlist',
     method: 'GET',
   },
-  swrOptions: {
-    revalidateOnFocus: false,
-  },
-  onResponse(response) {
-    return Object.create(response, {
-      isEmpty: {
-        get() {
-          return (response.data?.lineItems.length ?? 0) <= 0
-        },
-        enumerable: true,
-      },
-    })
-  },
 }
 
 export const bigcommerceProvider = {
diff --git a/framework/commerce/cart/use-cart.tsx b/framework/commerce/cart/use-cart.tsx
index 4ca20df69..9915c7478 100644
--- a/framework/commerce/cart/use-cart.tsx
+++ b/framework/commerce/cart/use-cart.tsx
@@ -1,7 +1,11 @@
-import { useMemo } from 'react'
 import Cookies from 'js-cookie'
 import type { Cart } from '../types'
-import type { Prop, HookFetcherFn, UseHookInput } from '../utils/types'
+import type {
+  Prop,
+  HookFetcherFn,
+  UseHookInput,
+  UseHookResponse,
+} from '../utils/types'
 import useData from '../utils/use-data-2'
 import { Provider, useCommerce } from '..'
 
@@ -14,12 +18,12 @@ export type UseCartHandler<P extends Provider> = Prop<
   'useCart'
 >
 
-export type CartResponse<P extends Provider> = ReturnType<
-  Prop<UseCartHandler<P>, 'onResponse'>
->
-
 export type UseCartInput<P extends Provider> = UseHookInput<UseCartHandler<P>>
 
+export type CartResponse<P extends Provider> = UseHookResponse<
+  UseCartHandler<P>
+>
+
 export type UseCart<P extends Provider> = Partial<
   UseCartInput<P>
 > extends UseCartInput<P>
@@ -36,8 +40,6 @@ export const fetcher: HookFetcherFn<Cart | null, FetchCartInput> = async ({
   return data && normalize ? normalize(data) : data
 }
 
-type X = UseCartInput<Provider>
-
 export default function useCart<P extends Provider>(
   input: UseCartInput<P> = {}
 ) {
@@ -46,49 +48,24 @@ export default function useCart<P extends Provider>(
   const provider = providerRef.current
   const opts = provider.cart?.useCart
 
-  const { swrOptions, ...hookInput } = input
+  const fetcherFn = opts?.fetcher ?? fetcher
+  const useHook = opts?.useHook ?? ((ctx) => ctx.useData())
 
-  return opts?.useHook!({
-    input: hookInput,
-    swrOptions,
+  const wrapper: typeof fetcher = (context) => {
+    context.input.cartId = Cookies.get(cartCookie)
+    return fetcherFn(context)
+  }
+
+  return useHook({
+    input,
     useData(ctx) {
-      const fetcherFn = opts?.fetcher ?? fetcher
-      const wrapper: typeof fetcher = (context) => {
-        context.input.cartId = Cookies.get(cartCookie)
-        return fetcherFn(context)
-      }
       const response = useData(
-        {
-          ...opts,
-          fetcher: wrapper,
-          swrOptions: {
-            ...opts.swrOptions,
-            ...(ctx?.swrOptions ?? swrOptions),
-          },
-        },
+        { ...opts, fetcher: wrapper },
         ctx?.input ?? [],
-        provider.fetcher ?? fetcherRef.current
+        provider.fetcher ?? fetcherRef.current,
+        ctx?.swrOptions ?? input.swrOptions
       )
       return response
     },
   })
-
-  // console.log(i)
-
-  // const fetcherFn = opts?.fetcher ?? fetcher
-  // const wrapper: typeof fetcher = (context) => {
-  //   context.input.cartId = Cookies.get(cartCookie)
-  //   return fetcherFn(context)
-  // }
-  // const response = useData(
-  //   { ...opts, fetcher: wrapper },
-  //   opts?.input ? opts.input(input ?? {}) : [],
-  //   provider.fetcher ?? fetcherRef.current
-  // )
-  // const memoizedResponse = useMemo(
-  //   () => (opts?.onResponse ? opts.onResponse(response) : response),
-  //   [response]
-  // )
-
-  // return memoizedResponse as CartResponse<P>
 }
diff --git a/framework/commerce/utils/types.ts b/framework/commerce/utils/types.ts
index d4d767ae1..7a4b73f93 100644
--- a/framework/commerce/utils/types.ts
+++ b/framework/commerce/utils/types.ts
@@ -71,19 +71,13 @@ export type HookHandler<
   // Custom state added to the response object of SWR
   State = {}
 > = {
-  input?(
-    input: Input & { swrOptions?: SwrOptions<Data, FetchInput, Result> }
-  ): HookFetchInput | HookSwrInput
   useHook?(context: {
-    input: Input
-    swrOptions?: SwrOptions<Data, FetchInput, Result>
+    input: Input & { swrOptions?: SwrOptions<Data, FetchInput, Result> }
     useData(context?: {
       input?: HookFetchInput | HookSwrInput
       swrOptions?: SwrOptions<Data, FetchInput, Result>
     }): ResponseState<Data>
   }): ResponseState<Data> & State
-  swrOptions?: SwrOptions<Data, FetchInput, Result>
-  onResponse?(response: ResponseState<Data>): ResponseState<Data> & State
   fetchOptions?: HookFetcherOptions
   fetcher?: HookFetcherFn<Data, FetchInput, Result, Body>
   normalizer?(data: Result): Data
@@ -104,8 +98,10 @@ export type UseHookParameters<H extends HookHandler<any>> = Parameters<
   Prop<H, 'useHook'>
 >
 
+export type UseHookResponse<H extends HookHandler<any>> = ReturnType<
+  Prop<H, 'useHook'>
+>
+
 export type UseHookInput<
   H extends HookHandler<any>
-> = UseHookParameters<H>[0]['input'] & {
-  swrOptions?: UseHookParameters<H>[0]['swrOptions']
-}
+> = UseHookParameters<H>[0]['input']
diff --git a/framework/commerce/utils/use-data-2.ts b/framework/commerce/utils/use-data-2.ts
index d9a9e9a39..e79daf632 100644
--- a/framework/commerce/utils/use-data-2.ts
+++ b/framework/commerce/utils/use-data-2.ts
@@ -5,6 +5,7 @@ import type {
   HookFetchInput,
   PickRequired,
   Fetcher,
+  SwrOptions,
 } from './types'
 import defineProperty from './define-property'
 import { CommerceError } from './errors'
@@ -25,10 +26,11 @@ export type UseData = <
     'fetcher'
   >,
   input: HookFetchInput | HookSwrInput,
-  fetcherFn: Fetcher
+  fetcherFn: Fetcher,
+  swrOptions?: SwrOptions<Data, FetchInput, Result>
 ) => ResponseState<Data>
 
-const useData: UseData = (options, input, fetcherFn) => {
+const useData: UseData = (options, input, fetcherFn, swrOptions) => {
   const hookInput = Array.isArray(input) ? input : Object.entries(input)
   const fetcher = async (
     url?: string,
@@ -64,7 +66,7 @@ const useData: UseData = (options, input, fetcherFn) => {
         : null
     },
     fetcher,
-    options.swrOptions
+    swrOptions
   )
 
   if (!('isLoading' in response)) {