diff --git a/.changeset/blue-carrots-juggle.md b/.changeset/blue-carrots-juggle.md
new file mode 100644
index 000000000..7ffdd90dd
--- /dev/null
+++ b/.changeset/blue-carrots-juggle.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: rename infinite key in query key to \_infinite
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
index fa76f250b..6f3399de7 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
@@ -77,6 +77,8 @@ const createQueryKeyFunction = ({ file }: { file: Files[keyof Files] }) => {
     ]),
   });
 
+  const infiniteIdentifier = compiler.identifier({ text: 'infinite' });
+
   const fn = compiler.constVariable({
     expression: compiler.arrowFunction({
       multiLine: true,
@@ -119,16 +121,16 @@ const createQueryKeyFunction = ({ file }: { file: Files[keyof Files] }) => {
           typeName: returnType,
         }),
         compiler.ifStatement({
-          expression: compiler.identifier({ text: 'infinite' }),
+          expression: infiniteIdentifier,
           thenStatement: ts.factory.createBlock(
             [
               compiler.expressionToStatement({
                 expression: compiler.binaryExpression({
                   left: compiler.propertyAccessExpression({
                     expression: 'params',
-                    name: 'infinite',
+                    name: '_infinite',
                   }),
-                  right: compiler.identifier({ text: 'infinite' }),
+                  right: infiniteIdentifier,
                 }),
               }),
             ],
@@ -261,7 +263,7 @@ const createQueryKeyType = ({ file }: { file: Files[keyof Files] }) => {
     },
     {
       isRequired: false,
-      name: 'infinite',
+      name: '_infinite',
       type: compiler.keywordTypeNode({
         keyword: 'boolean',
       }),
@@ -795,6 +797,9 @@ export const handler: PluginDefinition['handler'] = ({
                                         {
                                           spread: 'options',
                                         },
+                                        {
+                                          spread: 'queryKey[0]',
+                                        },
                                         {
                                           key: 'body',
                                           value: compiler.objectExpression({
@@ -853,12 +858,6 @@ export const handler: PluginDefinition['handler'] = ({
                                             ],
                                           }),
                                         },
-                                        {
-                                          key: getClientBaseUrlKey(),
-                                          value: compiler.identifier({
-                                            text: `client.getConfig().${getClientBaseUrlKey()}`,
-                                          }),
-                                        },
                                         {
                                           key: 'throwOnError',
                                           value: true,
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
index 9b65c358d..eb0696597 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
index 37e8cd17f..aee97c743 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
index 70c63bccc..eb7e8863a 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
index 1416a0bdf..a2aa7abfb 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
index 807676597..c1bfd9bc2 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
index 4a35673e6..561ff425a 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
index ac608082f..99376efb0 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseURL: client.getConfig().baseURL,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
index 12a63ed86..f74d4b83c 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
index eb4937625..f8f054081 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap
@@ -8,14 +8,14 @@ import type { ImportData, ImportError, ImportResponse, DeleteFooData3, CallWithD
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -236,6 +236,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -252,7 +253,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -322,6 +322,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -338,7 +339,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -374,6 +374,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -390,7 +391,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
index 2137cd4e3..9c3641ecb 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap
@@ -8,14 +8,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
index 08d97fb52..ad9ce357b 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap
@@ -8,14 +8,14 @@ import type { ImportData, ImportError, ImportResponse, DeleteFooData3, CallWithD
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -236,6 +236,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -252,7 +253,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -322,6 +322,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -338,7 +339,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -374,6 +374,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -390,7 +391,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
index 56130d72f..40dd68e07 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap
@@ -8,14 +8,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
index 2dc43a73f..841f82420 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap
@@ -8,14 +8,14 @@ import type { ImportData, ImportError, ImportResponse, DeleteFooData3, CallWithD
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -236,6 +236,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -252,7 +253,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -322,6 +322,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -338,7 +339,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -374,6 +374,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -390,7 +391,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
index 28037ce41..81c2f5663 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap
@@ -8,14 +8,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
index 615ce418b..06fe6f04b 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap
@@ -8,14 +8,14 @@ import type { ImportData, ImportError, ImportResponse, DeleteFooData3, CallWithD
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
@@ -236,6 +236,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
         };
         const { data } = await callWithParameters({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -252,7 +253,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -322,6 +322,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
         };
         const { data } = await getCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -338,7 +339,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
@@ -374,6 +374,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
         };
         const { data } = await postCallWithOptionalParam({
             ...options,
+            ...queryKey[0],
             body: {
                 ...queryKey[0].body as any,
                 ...page.body as any
@@ -390,7 +391,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
                 ...queryKey[0].query,
                 ...page.query
             },
-            baseUrl: client.getConfig().baseUrl,
             throwOnError: true
         });
         return data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
index dcb5b1387..1a7d1064e 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap
@@ -8,14 +8,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
 type QueryKey<TOptions extends Options> = [
     Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
         _id: string;
-        infinite?: boolean;
+        _infinite?: boolean;
     }
 ];
 
 const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
     const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: client.getConfig().baseUrl } as QueryKey<TOptions>[0];
     if (infinite) {
-        params.infinite = infinite;
+        params._infinite = infinite;
     }
     if (options?.body) {
         params.body = options.body;
diff --git a/packages/openapi-ts/test/sample.cjs b/packages/openapi-ts/test/sample.cjs
index bf82eb989..df4aef134 100644
--- a/packages/openapi-ts/test/sample.cjs
+++ b/packages/openapi-ts/test/sample.cjs
@@ -17,19 +17,19 @@ const main = async () => {
     output: {
       path: './test/generated/sample/',
     },
-    // plugins: [
-    //   {
-    //     // infiniteQueryOptions: false,
-    //     // mutationOptions: false,
-    //     name: '@tanstack/react-query',
-    //     // queryOptions: false,
-    //   },
-    // ],
+    plugins: [
+      {
+        // infiniteQueryOptions: false,
+        // mutationOptions: false,
+        name: '@tanstack/react-query',
+        // queryOptions: false,
+      },
+    ],
     schemas: {
       export: false,
     },
     services: {
-      export: false,
+      // export: false,
       // asClass: true,
       // filter: '^POST /api/v{api-version}/upload$',
       // export: false,