diff --git a/src/runtime/server/api/navigation.ts b/src/runtime/server/api/navigation.ts
index 30a5265ad..a779dcf58 100644
--- a/src/runtime/server/api/navigation.ts
+++ b/src/runtime/server/api/navigation.ts
@@ -1,11 +1,11 @@
+import { defineEventHandler } from 'h3'
 import { cacheStorage, serverQueryContent } from '../storage'
 import { createNav } from '../navigation'
 import type { ParsedContent, ParsedContentMeta } from '../../types'
 import { getContentQuery } from '../../utils/query'
 import { isPreview } from '../preview'
-import { cachedEventHandler } from '#imports'
 
-export default cachedEventHandler(async (event) => {
+export default defineEventHandler(async (event) => {
   const query = getContentQuery(event)
 
   // Read from cache if not preview and there is no query
@@ -50,7 +50,4 @@ export default cachedEventHandler(async (event) => {
   }, {} as Record<string, ParsedContentMeta>)
 
   return createNav((contents?.result || contents) as ParsedContentMeta[], configs)
-}, {
-  maxAge: 31536000,
-  shouldBypassCache: () => !!import.meta.dev
 })
diff --git a/src/runtime/server/api/query.ts b/src/runtime/server/api/query.ts
index 7de782a2f..63572593c 100644
--- a/src/runtime/server/api/query.ts
+++ b/src/runtime/server/api/query.ts
@@ -1,9 +1,9 @@
-import { createError } from 'h3'
+import { createError, defineEventHandler } from 'h3'
 import { serverQueryContent } from '../storage'
 import { getContentQuery } from '../../utils/query'
-import { useRuntimeConfig, cachedEventHandler } from '#imports'
+import { useRuntimeConfig } from '#imports'
 
-export default cachedEventHandler(async (event) => {
+export default defineEventHandler(async (event) => {
   const query = getContentQuery(event)
   const { advanceQuery } = useRuntimeConfig().public.content.experimental
 
@@ -39,7 +39,4 @@ export default cachedEventHandler(async (event) => {
   }
 
   return serverQueryContent(event, query).find()
-}, {
-  maxAge: 31536000,
-  shouldBypassCache: () => !!import.meta.dev
 })