diff --git a/packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte b/packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte
new file mode 100644
index 0000000000..1912606ecd
--- /dev/null
+++ b/packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  import { createQuery } from '../../src/createQuery'
+  import { sleep } from '../utils'
+
+  const query = createQuery({
+    queryKey: ['hello'],
+    queryFn: async () => {
+      await sleep(10)
+      return 'test'
+    },
+  })
+</script>
+
+<div>{$query.data}</div>
diff --git a/packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte b/packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte
new file mode 100644
index 0000000000..7129cf8a31
--- /dev/null
+++ b/packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  import { QueryClient } from '@tanstack/query-core'
+  import QueryClientProvider from '../../src/QueryClientProvider.svelte'
+  import ChildComponent from './ChildComponent.svelte'
+  import type { QueryCache } from '@tanstack/query-core'
+
+  export let queryCache: QueryCache
+
+  const queryClient = new QueryClient({ queryCache })
+</script>
+
+<QueryClientProvider client={queryClient}>
+  <ChildComponent />
+</QueryClientProvider>
diff --git a/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.test.ts b/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.test.ts
new file mode 100644
index 0000000000..86c9907cb7
--- /dev/null
+++ b/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, test } from 'vitest'
+import { render, waitFor } from '@testing-library/svelte'
+import { QueryCache } from '@tanstack/query-core'
+import ParentComponent from './ParentComponent.svelte'
+
+describe('QueryClientProvider', () => {
+  test('Sets a specific cache for all queries to use', async () => {
+    const queryCache = new QueryCache()
+
+    const rendered = render(ParentComponent, {
+      props: {
+        queryCache: queryCache,
+      },
+    })
+
+    await waitFor(() => rendered.getByText('test'))
+
+    expect(queryCache.find({ queryKey: ['hello'] })).toBeDefined()
+  })
+})
diff --git a/packages/svelte-query/tests/context.test.ts b/packages/svelte-query/tests/context/context.test.ts
similarity index 54%
rename from packages/svelte-query/tests/context.test.ts
rename to packages/svelte-query/tests/context/context.test.ts
index 8ea9dabeb1..f3428917d1 100644
--- a/packages/svelte-query/tests/context.test.ts
+++ b/packages/svelte-query/tests/context/context.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { getIsRestoringContext } from '../src/context'
+import { getIsRestoringContext } from '../../src/context'
 
 describe('getIsRestoringContext', () => {
-  it('Should not throw when called outside of a component', async () => {
+  it('Should not throw when called outside of a component', () => {
     expect(() => getIsRestoringContext()).to.not.throw()
   })
 })
diff --git a/packages/svelte-query/tests/CreateMutation.svelte b/packages/svelte-query/tests/createMutation/BaseExample.svelte
similarity index 62%
rename from packages/svelte-query/tests/CreateMutation.svelte
rename to packages/svelte-query/tests/createMutation/BaseExample.svelte
index 2c3074e3a7..e4bf80d4dd 100644
--- a/packages/svelte-query/tests/CreateMutation.svelte
+++ b/packages/svelte-query/tests/createMutation/BaseExample.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../src/context'
-  import { createMutation } from '../src/createMutation'
-  import type { CreateMutationOptions } from '../src/types'
+  import { setQueryClientContext } from '../../src/context'
+  import { createMutation } from '../../src/createMutation'
+  import type { CreateMutationOptions } from '../../src/types'
 
   export let options: CreateMutationOptions
 
diff --git a/packages/svelte-query/tests/createMutation.test.ts b/packages/svelte-query/tests/createMutation/createMutation.test.ts
similarity index 82%
rename from packages/svelte-query/tests/createMutation.test.ts
rename to packages/svelte-query/tests/createMutation/createMutation.test.ts
index 1c302ec36c..e306fd6763 100644
--- a/packages/svelte-query/tests/createMutation.test.ts
+++ b/packages/svelte-query/tests/createMutation/createMutation.test.ts
@@ -1,12 +1,12 @@
 import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/svelte'
-import CreateMutation from './CreateMutation.svelte'
+import BaseExample from './BaseExample.svelte'
 
 describe('createMutation', () => {
   it('Call mutate and check function runs', async () => {
     const mutationFn = vi.fn()
 
-    const rendered = render(CreateMutation, {
+    const rendered = render(BaseExample, {
       props: {
         options: {
           mutationFn,
diff --git a/packages/svelte-query/tests/CreateQueries.svelte b/packages/svelte-query/tests/createQueries/BaseExample.svelte
similarity index 81%
rename from packages/svelte-query/tests/CreateQueries.svelte
rename to packages/svelte-query/tests/createQueries/BaseExample.svelte
index 91e35d976f..bb2fe5a846 100644
--- a/packages/svelte-query/tests/CreateQueries.svelte
+++ b/packages/svelte-query/tests/createQueries/BaseExample.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { createQueries } from '../src/createQueries'
+  import { createQueries } from '../../src/createQueries'
   import type { QueryClient } from '@tanstack/query-core'
-  import type { QueriesOptions, QueriesResults } from '../src/createQueries'
+  import type { QueriesOptions, QueriesResults } from '../../src/createQueries'
 
   export let options: {
     queries: [...QueriesOptions<any>]
diff --git a/packages/svelte-query/tests/createQueries.test.ts b/packages/svelte-query/tests/createQueries/createQueries.test.ts
similarity index 91%
rename from packages/svelte-query/tests/createQueries.test.ts
rename to packages/svelte-query/tests/createQueries/createQueries.test.ts
index 8cf50e5ba4..3ccd4818d5 100644
--- a/packages/svelte-query/tests/createQueries.test.ts
+++ b/packages/svelte-query/tests/createQueries/createQueries.test.ts
@@ -1,12 +1,12 @@
 import { describe, expect, it } from 'vitest'
 import { render, waitFor } from '@testing-library/svelte'
 import { QueryClient } from '@tanstack/query-core'
-import CreateQueries from './CreateQueries.svelte'
-import { sleep } from './utils'
+import { sleep } from '../utils'
+import BaseExample from './BaseExample.svelte'
 
 describe('createQueries', () => {
   it('Render and wait for success', async () => {
-    const rendered = render(CreateQueries, {
+    const rendered = render(BaseExample, {
       props: {
         options: {
           queries: [
@@ -44,7 +44,7 @@ describe('createQueries', () => {
   it('should combine queries', async () => {
     const ids = [1, 2, 3]
 
-    const rendered = render(CreateQueries, {
+    const rendered = render(BaseExample, {
       props: {
         options: {
           queries: ids.map((id) => ({
diff --git a/packages/svelte-query/tests/CreateQuery.svelte b/packages/svelte-query/tests/createQuery/BaseExample.svelte
similarity index 79%
rename from packages/svelte-query/tests/CreateQuery.svelte
rename to packages/svelte-query/tests/createQuery/BaseExample.svelte
index 5a3ca255d6..e95b54d901 100644
--- a/packages/svelte-query/tests/CreateQuery.svelte
+++ b/packages/svelte-query/tests/createQuery/BaseExample.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { createQuery } from '../src/createQuery'
+  import { createQuery } from '../../src/createQuery'
   import type { QueryClient } from '@tanstack/query-core'
-  import type { CreateQueryOptions, StoreOrVal } from '../src/types'
+  import type { CreateQueryOptions, StoreOrVal } from '../../src/types'
 
   export let options: StoreOrVal<CreateQueryOptions<any>>
   export let queryClient: QueryClient
diff --git a/packages/svelte-query/tests/createQuery/DisabledExample.svelte b/packages/svelte-query/tests/createQuery/DisabledExample.svelte
new file mode 100644
index 0000000000..bcd5a99748
--- /dev/null
+++ b/packages/svelte-query/tests/createQuery/DisabledExample.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+  import { QueryClient } from '@tanstack/query-core'
+  import { derived, writable } from 'svelte/store'
+  import { createQuery } from '../../src/createQuery'
+  import { queryKey, sleep } from '../utils'
+
+  const queryClient = new QueryClient()
+  const key = queryKey()
+  const count = writable(0)
+
+  const options = derived(count, ($count) => ({
+    queryKey: [key, $count],
+    queryFn: async () => {
+      await sleep(5)
+      return $count
+    },
+    enabled: $count === 0,
+  }))
+
+  const query = createQuery(options, queryClient)
+</script>
+
+<button on:click={() => ($count += 1)}>Increment</button>
+<div>Data: {$query.data ?? 'undefined'}</div>
+<div>Count: {$count}</div>
diff --git a/packages/svelte-query/tests/createQuery.test.ts b/packages/svelte-query/tests/createQuery/createQuery.test.ts
similarity index 83%
rename from packages/svelte-query/tests/createQuery.test.ts
rename to packages/svelte-query/tests/createQuery/createQuery.test.ts
index 482043b7fd..0449eb951c 100644
--- a/packages/svelte-query/tests/createQuery.test.ts
+++ b/packages/svelte-query/tests/createQuery/createQuery.test.ts
@@ -1,13 +1,14 @@
 import { describe, expect, test } from 'vitest'
-import { render, waitFor } from '@testing-library/svelte'
+import { fireEvent, render, waitFor } from '@testing-library/svelte'
 import { derived, writable } from 'svelte/store'
 import { QueryClient } from '@tanstack/query-core'
-import CreateQuery from './CreateQuery.svelte'
-import { sleep } from './utils'
+import { sleep } from '../utils'
+import BaseExample from './BaseExample.svelte'
+import DisabledExample from './DisabledExample.svelte'
 
 describe('createQuery', () => {
   test('Render and wait for success', async () => {
-    const rendered = render(CreateQuery, {
+    const rendered = render(BaseExample, {
       props: {
         options: {
           queryKey: ['test'],
@@ -38,7 +39,7 @@ describe('createQuery', () => {
       },
     })
 
-    const rendered = render(CreateQuery, {
+    const rendered = render(BaseExample, {
       props: {
         options: optionsStore,
         queryClient: new QueryClient(),
@@ -61,7 +62,7 @@ describe('createQuery', () => {
       },
     }))
 
-    const rendered = render(CreateQuery, {
+    const rendered = render(BaseExample, {
       props: {
         options: derivedStore,
         queryClient: new QueryClient(),
@@ -84,7 +85,7 @@ describe('createQuery', () => {
       },
     }))
 
-    const rendered = render(CreateQuery, {
+    const rendered = render(BaseExample, {
       props: {
         options: derivedStore,
         queryClient: new QueryClient({
@@ -125,7 +126,7 @@ describe('createQuery', () => {
       placeholderData: (previousData: string) => previousData,
     }))
 
-    const rendered = render(CreateQuery, {
+    const rendered = render(BaseExample, {
       props: {
         options: derivedStore,
         queryClient: new QueryClient(),
@@ -154,4 +155,17 @@ describe('createQuery', () => {
       expect(rendered.queryByText('Success 2')).toBeInTheDocument()
     })
   })
+
+  test('Should not fetch when switching to a disabled query', async () => {
+    const rendered = render(DisabledExample)
+
+    await waitFor(() => rendered.getByText('Data: 0'))
+
+    fireEvent.click(rendered.getByRole('button', { name: /Increment/i }))
+
+    await waitFor(() => {
+      rendered.getByText('Count: 1')
+      rendered.getByText('Data: undefined')
+    })
+  })
 })
diff --git a/packages/svelte-query/tests/queryOptions.test.ts b/packages/svelte-query/tests/queryOptions/queryOptions.test.ts
similarity index 98%
rename from packages/svelte-query/tests/queryOptions.test.ts
rename to packages/svelte-query/tests/queryOptions/queryOptions.test.ts
index f73cc0c7d7..65c7e47679 100644
--- a/packages/svelte-query/tests/queryOptions.test.ts
+++ b/packages/svelte-query/tests/queryOptions/queryOptions.test.ts
@@ -1,6 +1,6 @@
 import { QueryClient, dataTagSymbol, skipToken } from '@tanstack/query-core'
 import { describe, expectTypeOf, it } from 'vitest'
-import { queryOptions } from '../src/queryOptions'
+import { queryOptions } from '../../src/queryOptions'
 
 describe('queryOptions', () => {
   it('should not allow excess properties', () => {
diff --git a/packages/svelte-query/tests/useIsFetching/BaseExample.svelte b/packages/svelte-query/tests/useIsFetching/BaseExample.svelte
new file mode 100644
index 0000000000..f94b56dd2b
--- /dev/null
+++ b/packages/svelte-query/tests/useIsFetching/BaseExample.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import { QueryClient } from '@tanstack/query-core'
+  import { derived, writable } from 'svelte/store'
+  import { createQuery } from '../../src/createQuery'
+  import { useIsFetching } from '../../src/useIsFetching'
+  import { queryKey, sleep } from '../utils'
+
+  const queryClient = new QueryClient()
+  const key = queryKey()
+  const ready = writable(false)
+
+  const isFetching = useIsFetching(undefined, queryClient)
+
+  const options = derived(ready, ($ready) => ({
+    queryKey: [key],
+    queryFn: async () => {
+      await sleep(50)
+      return 'test'
+    },
+    enabled: $ready,
+  }))
+
+  const query = createQuery(options, queryClient)
+
+  $: console.log($isFetching)
+</script>
+
+<button on:click={() => ($ready = true)}>setReady</button>
+<div>isFetching: {$isFetching}</div>
+
+{#if $query.isSuccess}
+  {$query.data}
+{/if}
diff --git a/packages/svelte-query/tests/useIsFetching/useIsFetching.test.ts b/packages/svelte-query/tests/useIsFetching/useIsFetching.test.ts
new file mode 100644
index 0000000000..7ca6ca6322
--- /dev/null
+++ b/packages/svelte-query/tests/useIsFetching/useIsFetching.test.ts
@@ -0,0 +1,14 @@
+import { describe, test } from 'vitest'
+import { fireEvent, render } from '@testing-library/svelte'
+import BaseExample from './BaseExample.svelte'
+
+describe('useIsFetching', () => {
+  test('should update as queries start and stop fetching', async () => {
+    const rendered = render(BaseExample)
+
+    await rendered.findByText('isFetching: 0')
+    fireEvent.click(rendered.getByRole('button', { name: /setReady/i }))
+    await rendered.findByText('isFetching: 1')
+    await rendered.findByText('isFetching: 0')
+  })
+})
diff --git a/packages/svelte-query/tests/UseMutationState.svelte b/packages/svelte-query/tests/useMutationState/BaseExample.svelte
similarity index 81%
rename from packages/svelte-query/tests/UseMutationState.svelte
rename to packages/svelte-query/tests/useMutationState/BaseExample.svelte
index d980c8121e..543a9a5271 100644
--- a/packages/svelte-query/tests/UseMutationState.svelte
+++ b/packages/svelte-query/tests/useMutationState/BaseExample.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../src/context'
-  import { createMutation } from '../src/createMutation'
-  import { useMutationState } from '../src/useMutationState'
+  import { setQueryClientContext } from '../../src/context'
+  import { createMutation } from '../../src/createMutation'
+  import { useMutationState } from '../../src/useMutationState'
   import type {
     CreateMutationOptions,
     MutationStateOptions,
-  } from '../src/types'
+  } from '../../src/types'
 
   export let successMutationOpts: CreateMutationOptions
   export let errorMutationOpts: CreateMutationOptions
diff --git a/packages/svelte-query/tests/useMutationState.test.ts b/packages/svelte-query/tests/useMutationState/useMutationState.test.ts
similarity index 93%
rename from packages/svelte-query/tests/useMutationState.test.ts
rename to packages/svelte-query/tests/useMutationState/useMutationState.test.ts
index d81b997377..0a9cc72e0c 100644
--- a/packages/svelte-query/tests/useMutationState.test.ts
+++ b/packages/svelte-query/tests/useMutationState/useMutationState.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 import { fireEvent, render, waitFor } from '@testing-library/svelte'
-import UseMutationState from './UseMutationState.svelte'
+import BaseExample from './BaseExample.svelte'
 
 describe('useMutationState', () => {
   it('run few mutation functions and check from useMutationState ', async () => {
@@ -10,7 +10,7 @@ describe('useMutationState', () => {
       throw 'error'
     })
 
-    const rendered = render(UseMutationState, {
+    const rendered = render(BaseExample, {
       props: {
         successMutationOpts: {
           mutationKey: ['success'],
@@ -47,7 +47,7 @@ describe('useMutationState', () => {
       throw 'error'
     })
 
-    const rendered = render(UseMutationState, {
+    const rendered = render(BaseExample, {
       props: {
         successMutationOpts: {
           mutationKey: ['success'],
@@ -86,7 +86,7 @@ describe('useMutationState', () => {
       throw 'error'
     })
 
-    const rendered = render(UseMutationState, {
+    const rendered = render(BaseExample, {
       props: {
         successMutationOpts: {
           mutationKey: ['success'],
diff --git a/packages/svelte-query/tests/utils.ts b/packages/svelte-query/tests/utils.ts
index 1a3a619a22..e8c5baf88b 100644
--- a/packages/svelte-query/tests/utils.ts
+++ b/packages/svelte-query/tests/utils.ts
@@ -3,3 +3,10 @@ export function sleep(timeout: number): Promise<void> {
     setTimeout(resolve, timeout)
   })
 }
+
+let queryKeyCount = 0
+
+export function queryKey(): string {
+  queryKeyCount += 1
+  return `query_${queryKeyCount}`
+}