diff --git a/components/fonts/font.rs b/components/fonts/font.rs
index 678c10cd776..7cedbd4d0f5 100644
--- a/components/fonts/font.rs
+++ b/components/fonts/font.rs
@@ -61,6 +61,15 @@ static TEXT_SHAPING_PERFORMANCE_COUNTER: AtomicUsize = AtomicUsize::new(0);
 // resources needed by the graphics layer to draw glyphs.
 
 pub trait PlatformFontMethods: Sized {
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "PlatformFontMethods::new_from_template",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
     fn new_from_template(
         template: FontTemplateRef,
         pt_size: Option<Au>,
diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index 65d6c7e1554..6f9a4a667a8 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -121,12 +121,26 @@ struct FlexItemLayoutResult {
 
 impl FlexItemLayoutResult {
     fn compatible_with_containing_block_size(&self, containing_block: &ContainingBlock) -> bool {
-        if containing_block.inline_size != self.containing_block_inline_size {
-            return false;
+        if containing_block.inline_size == self.containing_block_inline_size &&
+            (containing_block.block_size == self.containing_block_block_size ||
+                (!self.depends_on_block_constraints &&
+                    !self.has_child_which_depends_on_block_constraints))
+        {
+            return true;
         }
-        containing_block.block_size == self.containing_block_block_size ||
-            (!self.depends_on_block_constraints &&
-                !self.has_child_which_depends_on_block_constraints)
+
+        #[cfg(feature = "tracing")]
+        tracing::warn!(
+            name: "NonReplaced stretch cache miss",
+            cached_inline = ?self.containing_block_inline_size,
+            cached_block = ?self.containing_block_block_size,
+            required_inline = ?containing_block.inline_size,
+            required_block = ?containing_block.block_size,
+            depends_on_block_constraints = self.depends_on_block_constraints,
+            has_child_which_depends_on_block_constraints = self.has_child_which_depends_on_block_constraints,
+        );
+
+        false
     }
 
     fn compatible_with_containing_block_size_and_content_size(
@@ -608,7 +622,7 @@ impl FlexContainer {
         tracing::instrument(
             name = "FlexContainer::layout",
             skip_all,
-            fields(servo_profiling = true),
+            fields(servo_profiling = true, self_address = self as *const _ as usize),
             level = "trace",
         )
     )]
@@ -1833,6 +1847,20 @@ impl FlexItem<'_> {
     /// From <https://drafts.csswg.org/css-flexbox/#algo-cross-item>:
     /// > performing layout as if it were an in-flow block-level box with the used main
     /// > size and the given available space, treating `auto` as `fit-content`.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "FlexItem::layout",
+            skip_all,
+            fields(
+                servo_profiling = true,
+                self_address = self as *const _ as usize,
+                box_address = self.box_ as *const _ as usize,
+                for_stretch = non_stretch_layout_result.is_some(),
+            ),
+            level = "trace",
+        )
+    )]
     #[allow(clippy::too_many_arguments)]
     fn layout(
         &self,
@@ -2774,7 +2802,17 @@ impl FlexItemBox {
                     if let Some(cache) = &*self.block_content_size_cache.borrow() {
                         if inline_size == cache.containing_block_inline_size {
                             return cache.content_block_size;
+                        } else {
+                            #[cfg(feature = "tracing")]
+                            tracing::warn!(
+                                name: "NonReplaced cache miss",
+                                cached = ?cache.containing_block_inline_size,
+                                required = ?inline_size,
+                            );
                         }
+                    } else {
+                        #[cfg(feature = "tracing")]
+                        tracing::warn!(name: "NonReplaced no cache", required = ?inline_size);
                     }
 
                     let layout = non_replaced.layout(
diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs
index b9f97f62622..f268a8dbc7f 100644
--- a/components/layout_2020/flow/inline/mod.rs
+++ b/components/layout_2020/flow/inline/mod.rs
@@ -1505,6 +1505,15 @@ impl From<&InheritedText> for SegmentContentFlags {
 }
 
 impl InlineFormattingContext {
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(
+            name = "InlineFormattingContext::new_with_builder",
+            skip_all,
+            fields(servo_profiling = true),
+            level = "trace",
+        )
+    )]
     pub(super) fn new_with_builder(
         builder: InlineFormattingContextBuilder,
         layout_context: &LayoutContext,