diff --git a/packages/api-headless-cms/src/graphqlFields/richText/RichTextPluginsProcessor.ts b/packages/api-headless-cms/src/graphqlFields/richText/RichTextPluginsProcessor.ts
index cd47db75d31..7c7f46738a0 100644
--- a/packages/api-headless-cms/src/graphqlFields/richText/RichTextPluginsProcessor.ts
+++ b/packages/api-headless-cms/src/graphqlFields/richText/RichTextPluginsProcessor.ts
@@ -1,7 +1,7 @@
-import { CmsRichTextRendererPlugin, RTEContents } from "~/plugins";
+import { CmsRichTextRendererPlugin, RichTextContents } from "~/plugins";
 
 interface RichTextRenderer {
-    render(contents: RTEContents): Promise<unknown>;
+    render(contents: RichTextContents): Promise<unknown>;
 }
 
 class NullRenderer implements RichTextRenderer {
@@ -20,7 +20,7 @@ export class RichTextPluginsProcessor {
         );
     }
 
-    async render(contents: RTEContents) {
+    async render(contents: RichTextContents) {
         return this.renderer.render(contents);
     }
 }
@@ -34,11 +34,11 @@ class RichTextRendererDecorator implements RichTextRenderer {
         this.plugin = plugin;
     }
 
-    render(contents: RTEContents) {
+    render(contents: RichTextContents) {
         return this.plugin.render(contents, this.next);
     }
 
-    private next = (contents: RTEContents) => {
+    private next = (contents: RichTextContents) => {
         return this.renderer.render(contents);
     };
 }
diff --git a/packages/api-headless-cms/src/graphqlFields/richText/richTextResolver.ts b/packages/api-headless-cms/src/graphqlFields/richText/richTextResolver.ts
index f47850aa9fb..a645d00ce7d 100644
--- a/packages/api-headless-cms/src/graphqlFields/richText/richTextResolver.ts
+++ b/packages/api-headless-cms/src/graphqlFields/richText/richTextResolver.ts
@@ -1,29 +1,7 @@
-import { Context } from "@webiny/api/types";
 import { GraphQLFieldResolver } from "@webiny/handler-graphql/types";
-import { CmsModelField } from "~/types";
-import { CmsRichTextRendererPlugin, RTEContents, RichTextRenderer } from "~/plugins";
-import { RichTextPluginsProcessor } from "./RichTextPluginsProcessor";
-
-const renderersMap = new Map<string, Promise<RichTextRenderer<unknown>>>();
-
-const getRendererByType = async (format: string, context: Context) => {
-    if (!renderersMap.has(format)) {
-        const renderersFactory = new Promise<RichTextRenderer<unknown>>(resolve => {
-            const plugins = context.plugins
-                .byType<CmsRichTextRendererPlugin<unknown>>(CmsRichTextRendererPlugin.type)
-                .filter(plugin => plugin.format === format);
-
-            const renderer = new RichTextPluginsProcessor(plugins);
-
-            resolve((contents: RTEContents) => {
-                return renderer.render(contents);
-            });
-        });
-        renderersMap.set(format, renderersFactory);
-    }
-
-    return renderersMap.get(format) as Promise<RichTextRenderer<unknown>>;
-};
+import { CmsContext, CmsModelField } from "~/types";
+import { RichTextContents } from "~/plugins";
+import { RichTextRenderer } from "~/utils/RichTextRenderer";
 
 interface ResolverArgs {
     format?: string;
@@ -33,19 +11,21 @@ export const createRichTextResolver = (
     field: CmsModelField
 ): GraphQLFieldResolver<any, ResolverArgs> => {
     return async (entry, args, context) => {
-        const rawValue = entry[field.fieldId] as RTEContents;
+        const rawValue = entry[field.fieldId] as RichTextContents;
         const outputFormat = args.format;
 
         if (!outputFormat) {
             return rawValue;
         }
 
-        const render = await getRendererByType(outputFormat, context);
+        const renderer = RichTextRenderer.create(context as CmsContext);
 
         if (field.multipleValues) {
-            return rawValue.map(render);
+            return (rawValue as RichTextContents[]).map(value =>
+                renderer.render(outputFormat, value)
+            );
         }
 
-        return render(rawValue);
+        return renderer.render(outputFormat, rawValue);
     };
 };
diff --git a/packages/api-headless-cms/src/htmlRenderer/createLexicalHTMLRenderer.ts b/packages/api-headless-cms/src/htmlRenderer/createLexicalHTMLRenderer.ts
index d43bd93d9de..304eac534dd 100644
--- a/packages/api-headless-cms/src/htmlRenderer/createLexicalHTMLRenderer.ts
+++ b/packages/api-headless-cms/src/htmlRenderer/createLexicalHTMLRenderer.ts
@@ -1,7 +1,7 @@
 import type { SerializedEditorState } from "@webiny/lexical-converter";
-import { CmsRichTextRendererPlugin, RTEContents } from "~/plugins";
+import { CmsRichTextRendererPlugin, RichTextContents } from "~/plugins";
 
-const isLexicalContents = (contents: RTEContents): contents is SerializedEditorState => {
+const isLexicalContents = (contents: RichTextContents): contents is SerializedEditorState => {
     return contents.hasOwnProperty("root");
 };
 
diff --git a/packages/api-headless-cms/src/index.ts b/packages/api-headless-cms/src/index.ts
index 1afe7ac5d03..abbea1c0e6b 100644
--- a/packages/api-headless-cms/src/index.ts
+++ b/packages/api-headless-cms/src/index.ts
@@ -58,5 +58,6 @@ export const createHeadlessCmsContext = (params: ContentContextParams) => {
 export * from "~/graphqlFields";
 export * from "~/plugins";
 export * from "~/utils/incrementEntryIdVersion";
+export * from "~/utils/RichTextRenderer";
 export * from "./graphql/handleRequest";
 export { entryToStorageTransform, entryFieldFromStorageTransform, entryFromStorageTransform };
diff --git a/packages/api-headless-cms/src/plugins/CmsRichTextRendererPlugin.ts b/packages/api-headless-cms/src/plugins/CmsRichTextRendererPlugin.ts
index f7590970ef8..e96d1bd69f7 100644
--- a/packages/api-headless-cms/src/plugins/CmsRichTextRendererPlugin.ts
+++ b/packages/api-headless-cms/src/plugins/CmsRichTextRendererPlugin.ts
@@ -1,15 +1,15 @@
 import { Plugin } from "@webiny/plugins";
 
-export interface RTEContents {
+export interface RichTextContents {
     [key: string]: any;
 }
 
-export interface RichTextRenderer<T> {
-    (contents: RTEContents): Promise<T>;
+export interface CmsRichTextRenderer<T> {
+    (contents: RichTextContents): Promise<T>;
 }
 
 export interface RichTextRendererMiddleware<T> {
-    (contents: RTEContents, next: RichTextRenderer<T>): Promise<T> | T;
+    (contents: RichTextContents, next: CmsRichTextRenderer<T>): Promise<T> | T;
 }
 
 interface CmsRichTextRendererConstructorParams<T> {
@@ -17,7 +17,7 @@ interface CmsRichTextRendererConstructorParams<T> {
     render: RichTextRendererMiddleware<T>;
 }
 
-export class CmsRichTextRendererPlugin<T> extends Plugin {
+export class CmsRichTextRendererPlugin<T = unknown> extends Plugin {
     public static override readonly type: string = "cms-rich-text-renderer";
     private readonly outputFormat: string;
     private readonly renderer: RichTextRendererMiddleware<T>;
@@ -32,7 +32,7 @@ export class CmsRichTextRendererPlugin<T> extends Plugin {
         return this.outputFormat;
     }
 
-    async render(contents: RTEContents, next: RichTextRenderer<T>) {
+    async render(contents: RichTextContents, next: CmsRichTextRenderer<T>) {
         return this.renderer(contents, next);
     }
 }
diff --git a/packages/api-headless-cms/src/utils/RichTextRenderer.ts b/packages/api-headless-cms/src/utils/RichTextRenderer.ts
new file mode 100644
index 00000000000..caa1dc2e36a
--- /dev/null
+++ b/packages/api-headless-cms/src/utils/RichTextRenderer.ts
@@ -0,0 +1,35 @@
+import { CmsRichTextRendererPlugin, RichTextContents } from "~/plugins";
+import { CmsContext } from "~/types";
+import { RichTextPluginsProcessor } from "~/graphqlFields/richText/RichTextPluginsProcessor";
+
+export class RichTextRenderer {
+    private renderersMap = new Map<string, RichTextPluginsProcessor>();
+    private plugins: CmsRichTextRendererPlugin[] = [];
+
+    private constructor(plugins: CmsRichTextRendererPlugin[]) {
+        this.plugins = plugins;
+    }
+
+    static create(context: CmsContext) {
+        const rendererPlugins = context.plugins.byType<CmsRichTextRendererPlugin>(
+            CmsRichTextRendererPlugin.type
+        );
+        return new RichTextRenderer(rendererPlugins);
+    }
+
+    async render(format: string, contents: RichTextContents) {
+        const renderer = this.getRendererByType(format);
+
+        return renderer.render(contents);
+    }
+
+    private getRendererByType(format: string) {
+        if (!this.renderersMap.has(format)) {
+            const plugins = this.plugins.filter(plugin => plugin.format === format);
+
+            this.renderersMap.set(format, new RichTextPluginsProcessor(plugins));
+        }
+
+        return this.renderersMap.get(format) as RichTextPluginsProcessor;
+    }
+}