diff --git a/engine/src/flutter/impeller/entity/contents/content_context.cc b/engine/src/flutter/impeller/entity/contents/content_context.cc
index 6b89e36efe6..ac398a11c5a 100644
--- a/engine/src/flutter/impeller/entity/contents/content_context.cc
+++ b/engine/src/flutter/impeller/entity/contents/content_context.cc
@@ -160,9 +160,8 @@ static std::unique_ptr<PipelineT> CreateDefaultPipeline(
 
 ContentContext::ContentContext(std::shared_ptr<Context> context)
     : context_(std::move(context)),
+      lazy_glyph_atlas_(std::make_shared<LazyGlyphAtlas>()),
       tessellator_(std::make_shared<Tessellator>()),
-      alpha_glyph_atlas_context_(std::make_shared<GlyphAtlasContext>()),
-      color_glyph_atlas_context_(std::make_shared<GlyphAtlasContext>()),
       scene_context_(std::make_shared<scene::SceneContext>(context_)) {
   if (!context_ || !context_->IsValid()) {
     return;
@@ -411,12 +410,6 @@ std::shared_ptr<Tessellator> ContentContext::GetTessellator() const {
   return tessellator_;
 }
 
-std::shared_ptr<GlyphAtlasContext> ContentContext::GetGlyphAtlasContext(
-    GlyphAtlas::Type type) const {
-  return type == GlyphAtlas::Type::kAlphaBitmap ? alpha_glyph_atlas_context_
-                                                : color_glyph_atlas_context_;
-}
-
 std::shared_ptr<Context> ContentContext::GetContext() const {
   return context_;
 }
diff --git a/engine/src/flutter/impeller/entity/contents/content_context.h b/engine/src/flutter/impeller/entity/contents/content_context.h
index 55f0a488c87..cab89c12533 100644
--- a/engine/src/flutter/impeller/entity/contents/content_context.h
+++ b/engine/src/flutter/impeller/entity/contents/content_context.h
@@ -680,9 +680,6 @@ class ContentContext {
 
   std::shared_ptr<Context> GetContext() const;
 
-  std::shared_ptr<GlyphAtlasContext> GetGlyphAtlasContext(
-      GlyphAtlas::Type type) const;
-
   const Capabilities& GetDeviceCapabilities() const;
 
   void SetWireframe(bool wireframe);
@@ -697,11 +694,6 @@ class ContentContext {
                                        const SubpassCallback& subpass_callback,
                                        bool msaa_enabled = true) const;
 
-  void SetLazyGlyphAtlas(
-      const std::shared_ptr<LazyGlyphAtlas>& lazy_glyph_atlas) {
-    lazy_glyph_atlas_ = lazy_glyph_atlas;
-  }
-
   std::shared_ptr<LazyGlyphAtlas> GetLazyGlyphAtlas() const {
     return lazy_glyph_atlas_;
   }
@@ -861,8 +853,6 @@ class ContentContext {
 
   bool is_valid_ = false;
   std::shared_ptr<Tessellator> tessellator_;
-  std::shared_ptr<GlyphAtlasContext> alpha_glyph_atlas_context_;
-  std::shared_ptr<GlyphAtlasContext> color_glyph_atlas_context_;
   std::shared_ptr<scene::SceneContext> scene_context_;
   bool wireframe_ = false;
 
diff --git a/engine/src/flutter/impeller/entity/contents/text_contents.cc b/engine/src/flutter/impeller/entity/contents/text_contents.cc
index fe6963d1684..9f28e9e9799 100644
--- a/engine/src/flutter/impeller/entity/contents/text_contents.cc
+++ b/engine/src/flutter/impeller/entity/contents/text_contents.cc
@@ -32,12 +32,10 @@ void TextContents::SetTextFrame(const TextFrame& frame) {
 std::shared_ptr<GlyphAtlas> TextContents::ResolveAtlas(
     GlyphAtlas::Type type,
     const std::shared_ptr<LazyGlyphAtlas>& lazy_atlas,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
     std::shared_ptr<Context> context) const {
   FML_DCHECK(lazy_atlas);
   if (lazy_atlas) {
-    return lazy_atlas->CreateOrGetGlyphAtlas(type, std::move(atlas_context),
-                                             std::move(context));
+    return lazy_atlas->CreateOrGetGlyphAtlas(type, std::move(context));
   }
 
   return nullptr;
@@ -92,8 +90,7 @@ bool TextContents::Render(const ContentContext& renderer,
 
   auto type = frame_.GetAtlasType();
   auto atlas =
-      ResolveAtlas(type, renderer.GetLazyGlyphAtlas(),
-                   renderer.GetGlyphAtlasContext(type), renderer.GetContext());
+      ResolveAtlas(type, renderer.GetLazyGlyphAtlas(), renderer.GetContext());
 
   if (!atlas || !atlas->IsValid()) {
     VALIDATION_LOG << "Cannot render glyphs without prepared atlas.";
diff --git a/engine/src/flutter/impeller/entity/contents/text_contents.h b/engine/src/flutter/impeller/entity/contents/text_contents.h
index c75daa0a506..4499586735a 100644
--- a/engine/src/flutter/impeller/entity/contents/text_contents.h
+++ b/engine/src/flutter/impeller/entity/contents/text_contents.h
@@ -65,7 +65,6 @@ class TextContents final : public Contents {
   std::shared_ptr<GlyphAtlas> ResolveAtlas(
       GlyphAtlas::Type type,
       const std::shared_ptr<LazyGlyphAtlas>& lazy_atlas,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
       std::shared_ptr<Context> context) const;
 
   FML_DISALLOW_COPY_AND_ASSIGN(TextContents);
diff --git a/engine/src/flutter/impeller/entity/entity_pass.cc b/engine/src/flutter/impeller/entity/entity_pass.cc
index ee4d0c9c051..ec070920678 100644
--- a/engine/src/flutter/impeller/entity/entity_pass.cc
+++ b/engine/src/flutter/impeller/entity/entity_pass.cc
@@ -254,9 +254,8 @@ bool EntityPass::Render(ContentContext& renderer,
     return false;
   }
 
-  renderer.SetLazyGlyphAtlas(std::make_shared<LazyGlyphAtlas>());
   fml::ScopedCleanupClosure reset_lazy_glyph_atlas(
-      [&renderer]() { renderer.SetLazyGlyphAtlas(nullptr); });
+      [&renderer]() { renderer.GetLazyGlyphAtlas()->ResetTextFrames(); });
 
   IterateAllEntities([lazy_glyph_atlas =
                           renderer.GetLazyGlyphAtlas()](const Entity& entity) {
diff --git a/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.cc b/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.cc
index 94c738e37b7..f98f8af6d62 100644
--- a/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.cc
+++ b/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.cc
@@ -11,7 +11,9 @@
 
 namespace impeller {
 
-LazyGlyphAtlas::LazyGlyphAtlas() = default;
+LazyGlyphAtlas::LazyGlyphAtlas()
+    : alpha_context_(std::make_shared<GlyphAtlasContext>()),
+      color_context_(std::make_shared<GlyphAtlasContext>()) {}
 
 LazyGlyphAtlas::~LazyGlyphAtlas() = default;
 
@@ -24,9 +26,14 @@ void LazyGlyphAtlas::AddTextFrame(const TextFrame& frame, Scalar scale) {
   }
 }
 
+void LazyGlyphAtlas::ResetTextFrames() {
+  alpha_set_.clear();
+  color_set_.clear();
+  atlas_map_.clear();
+}
+
 std::shared_ptr<GlyphAtlas> LazyGlyphAtlas::CreateOrGetGlyphAtlas(
     GlyphAtlas::Type type,
-    std::shared_ptr<GlyphAtlasContext> atlas_context,
     std::shared_ptr<Context> context) const {
   {
     auto atlas_it = atlas_map_.find(type);
@@ -40,8 +47,9 @@ std::shared_ptr<GlyphAtlas> LazyGlyphAtlas::CreateOrGetGlyphAtlas(
     return nullptr;
   }
   auto& set = type == GlyphAtlas::Type::kAlphaBitmap ? alpha_set_ : color_set_;
-  auto atlas =
-      text_context->CreateGlyphAtlas(type, std::move(atlas_context), set);
+  auto atlas_context =
+      type == GlyphAtlas::Type::kAlphaBitmap ? alpha_context_ : color_context_;
+  auto atlas = text_context->CreateGlyphAtlas(type, atlas_context, set);
   if (!atlas || !atlas->IsValid()) {
     VALIDATION_LOG << "Could not create valid atlas.";
     return nullptr;
diff --git a/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.h b/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.h
index f79b46db9d3..7289538eb4b 100644
--- a/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.h
+++ b/engine/src/flutter/impeller/typographer/lazy_glyph_atlas.h
@@ -21,14 +21,17 @@ class LazyGlyphAtlas {
 
   void AddTextFrame(const TextFrame& frame, Scalar scale);
 
+  void ResetTextFrames();
+
   std::shared_ptr<GlyphAtlas> CreateOrGetGlyphAtlas(
       GlyphAtlas::Type type,
-      std::shared_ptr<GlyphAtlasContext> atlas_context,
       std::shared_ptr<Context> context) const;
 
  private:
   FontGlyphPair::Set alpha_set_;
   FontGlyphPair::Set color_set_;
+  std::shared_ptr<GlyphAtlasContext> alpha_context_;
+  std::shared_ptr<GlyphAtlasContext> color_context_;
   mutable std::unordered_map<GlyphAtlas::Type, std::shared_ptr<GlyphAtlas>>
       atlas_map_;
 
diff --git a/engine/src/flutter/impeller/typographer/typographer_unittests.cc b/engine/src/flutter/impeller/typographer/typographer_unittests.cc
index b2da0e6b80e..02e8e790f83 100644
--- a/engine/src/flutter/impeller/typographer/typographer_unittests.cc
+++ b/engine/src/flutter/impeller/typographer/typographer_unittests.cc
@@ -122,13 +122,11 @@ TEST_P(TypographerTest, LazyAtlasTracksColor) {
   lazy_atlas.AddTextFrame(frame, 1.0f);
 
   // Creates different atlases for color and alpha bitmap.
-  auto color_context = std::make_shared<GlyphAtlasContext>();
-  auto bitmap_context = std::make_shared<GlyphAtlasContext>();
   auto color_atlas = lazy_atlas.CreateOrGetGlyphAtlas(
-      GlyphAtlas::Type::kColorBitmap, color_context, GetContext());
+      GlyphAtlas::Type::kColorBitmap, GetContext());
 
   auto bitmap_atlas = lazy_atlas.CreateOrGetGlyphAtlas(
-      GlyphAtlas::Type::kAlphaBitmap, bitmap_context, GetContext());
+      GlyphAtlas::Type::kAlphaBitmap, GetContext());
 
   ASSERT_FALSE(color_atlas == bitmap_atlas);
 }