diff --git a/playwright/_impl/_connection.py b/playwright/_impl/_connection.py
index 2d1dad933..501c18e2a 100644
--- a/playwright/_impl/_connection.py
+++ b/playwright/_impl/_connection.py
@@ -19,12 +19,14 @@
 import inspect
 import sys
 import traceback
+from inspect import FrameInfo
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
     Dict,
+    Iterator,
     List,
     Mapping,
     Optional,
@@ -362,7 +364,7 @@ def _send_message_to_server(
             "params": self._replace_channels_with_guids(params),
             "metadata": metadata,
         }
-        if self._tracing_count > 0 and frames and object._guid != "localUtils":
+        if self.needs_full_stack_trace() and frames and object._guid != "localUtils":
             self.local_utils.add_stack_to_tracing_no_reply(id, frames)
 
         self._transport.send(message)
@@ -508,17 +510,44 @@ def _replace_guids_with_channels(self, payload: Any) -> Any:
             return result
         return payload
 
+    def needs_full_stack_trace(self) -> bool:
+        return self._tracing_count > 0
+
+    def get_frame_info(self) -> Iterator[FrameInfo]:
+        current_frame = inspect.currentframe()
+
+        if current_frame is None:
+            return
+
+        # Don't include the current method ("get_frame_info()") in the callstack
+        current_frame = current_frame.f_back
+
+        while current_frame:
+            traceback_info = inspect.getframeinfo(current_frame, 0)
+
+            yield FrameInfo(
+                current_frame,
+                traceback_info.filename,
+                traceback_info.lineno,
+                traceback_info.function,
+                traceback_info.code_context,
+                traceback_info.index,
+            )
+
+            current_frame = current_frame.f_back
+
     async def wrap_api_call(
         self, cb: Callable[[], Any], is_internal: bool = False
     ) -> Any:
         if self._api_zone.get():
             return await cb()
         task = asyncio.current_task(self._loop)
-        st: List[inspect.FrameInfo] = getattr(
-            task, "__pw_stack__", None
-        ) or inspect.stack(0)
-
-        parsed_st = _extract_stack_trace_information_from_stack(st, is_internal)
+        st: Union[List[FrameInfo], Iterator[FrameInfo]] = (
+            getattr(task, "__pw_stack__", None) or self.get_frame_info()
+        )
+        parsed_st = _extract_stack_trace_information_from_stack(
+            st, is_internal, self.needs_full_stack_trace()
+        )
         self._api_zone.set(parsed_st)
         try:
             return await cb()
@@ -533,10 +562,12 @@ def wrap_api_call_sync(
         if self._api_zone.get():
             return cb()
         task = asyncio.current_task(self._loop)
-        st: List[inspect.FrameInfo] = getattr(
-            task, "__pw_stack__", None
-        ) or inspect.stack(0)
-        parsed_st = _extract_stack_trace_information_from_stack(st, is_internal)
+        st: Union[List[FrameInfo], Iterator[FrameInfo]] = (
+            getattr(task, "__pw_stack__", None) or self.get_frame_info()
+        )
+        parsed_st = _extract_stack_trace_information_from_stack(
+            st, is_internal, self.needs_full_stack_trace()
+        )
         self._api_zone.set(parsed_st)
         try:
             return cb()
@@ -567,7 +598,9 @@ class ParsedStackTrace(TypedDict):
 
 
 def _extract_stack_trace_information_from_stack(
-    st: List[inspect.FrameInfo], is_internal: bool
+    st: Union[List[FrameInfo], Iterator[FrameInfo]],
+    is_internal: bool,
+    needs_full_stack: bool,
 ) -> ParsedStackTrace:
     playwright_module_path = str(Path(playwright.__file__).parents[0])
     last_internal_api_name = ""
@@ -596,6 +629,9 @@ def _extract_stack_trace_information_from_stack(
                     "function": method_name,
                 }
             )
+
+            if not needs_full_stack:
+                break
         if is_playwright_internal:
             last_internal_api_name = method_name
         elif last_internal_api_name: