diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
index 0a48afb52..1aa1ac79e 100644
--- a/.github/workflows/demo.yml
+++ b/.github/workflows/demo.yml
@@ -39,10 +39,11 @@ jobs:
       run: |
           dotnet run --project PuppeteerSharpPdfDemo-Local.csproj auto-exit -f net8.0
     - name: Run with AOT
-      if: matrix.os == 'macos-latest'
+      if: matrix.os == 'windows-2022'
       working-directory: ./demos/PuppeteerSharpPdfDemo
       run: |
-          dotnet run --project PuppeteerSharpPdfDemo-Local.csproj  -r osx-arm64  -c Release -f net8.0 auto-exit
+          dotnet publish PuppeteerSharpPdfDemo-Local.csproj -r win-x64 -o build  -f net8.0
+          build/PuppeteerSharpPdfDemo-Local.exe auto-exit
     - name: Run on .NET Framework
       if: matrix.os == 'windows-2022'
       working-directory: ./demos/PuppeteerSharpPdfDemo
diff --git a/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs b/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
index babb7da34..6b4d1363f 100644
--- a/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
+++ b/lib/PuppeteerSharp.Nunit/PuppeteerTestAttribute.cs
@@ -172,13 +172,9 @@ private static TestExpectation[] GetUpstreamExpectations() =>
             _upstreamExpectations ??= LoadExpectationsFromResource("PuppeteerSharp.Nunit.TestExpectations.TestExpectations.upstream.json");
 
         private static readonly JsonSerializerOptions DefaultJsonSerializerOptions =
-            new JsonSerializerOptions()
+            new()
             {
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters =
-                {
-                    new JsonStringEnumMemberConverter(),
-                },
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
             };
 
         private static TestExpectation[] LoadExpectationsFromResource(string resourceName)
diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectation.cs b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectation.cs
index 5d6982028..5a13f1166 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectation.cs
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectation.cs
@@ -21,7 +21,9 @@
 //  * SOFTWARE.
 
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Nunit.TestExpectations;
 
@@ -54,6 +56,7 @@ public Regex TestIdRegex
 
     public TestExpectationResult[] Expectations { get; set; }
 
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<TestExpectationResult>))]
     public enum TestExpectationResult
     {
         [EnumMember(Value = "FAIL")] Fail,
@@ -62,6 +65,7 @@ public enum TestExpectationResult
         [EnumMember(Value = "TIMEOUT")] Timeout,
     }
 
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<TestExpectationsParameter>))]
     public enum TestExpectationsParameter
     {
         [EnumMember(Value = "firefox")]
@@ -80,6 +84,7 @@ public enum TestExpectationsParameter
         Headful,
     }
 
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<TestExpectationPlatform>))]
     public enum TestExpectationPlatform
     {
         [EnumMember(Value = "darwin")]
diff --git a/lib/PuppeteerSharp/BrowserData/FirefoxChannel.cs b/lib/PuppeteerSharp/BrowserData/FirefoxChannel.cs
index f231990d1..2598ebee2 100644
--- a/lib/PuppeteerSharp/BrowserData/FirefoxChannel.cs
+++ b/lib/PuppeteerSharp/BrowserData/FirefoxChannel.cs
@@ -21,12 +21,15 @@
 //  * SOFTWARE.
 
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.BrowserData;
 
 /// <summary>
 /// Firefox channels.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumMemberConverter<FirefoxChannel>))]
 public enum FirefoxChannel
 {
     /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs
index 7a0a05004..64f46620d 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/DispatchKeyEventType.cs
@@ -1,7 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<DispatchKeyEventType>))]
     internal enum DispatchKeyEventType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs
index 028db5e82..0de14ee02 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/DragEventType.cs
@@ -1,7 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<DragEventType>))]
     internal enum DragEventType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs b/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs
index acdc87dd3..18e52a1f0 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/FileChooserAction.cs
@@ -1,7 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<FileChooserAction>))]
     internal enum FileChooserAction
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/LogSource.cs b/lib/PuppeteerSharp/Cdp/Messaging/LogSource.cs
index f3d8d772f..a2f286a1c 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/LogSource.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/LogSource.cs
@@ -1,5 +1,9 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp.Cdp.Messaging;
 
+[JsonConverter(typeof(JsonStringEnumMemberConverter<LogSource>))]
 internal enum LogSource
 {
     Xml = 0,
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs b/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs
index 98f163823..b23397a3a 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/MouseEventType.cs
@@ -1,7 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<MouseEventType>))]
     internal enum MouseEventType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/NavigationType.cs b/lib/PuppeteerSharp/Cdp/Messaging/NavigationType.cs
index 8164842b0..ee8963833 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/NavigationType.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/NavigationType.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp.Cdp.Messaging;
 
 /// <summary>
 /// Navigation types.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumMemberConverter<NavigationType>))]
 public enum NavigationType
 {
     /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs
index 3fb21fc9f..825561d54 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/PageFrameDetachedResponse.cs
@@ -1,5 +1,9 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp.Cdp.Messaging
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<FrameDetachedReason>))]
     internal enum FrameDetachedReason
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs
index 399380c62..a35b72bc0 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectSubtype.cs
@@ -1,3 +1,4 @@
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
@@ -5,6 +6,7 @@ namespace PuppeteerSharp.Cdp.Messaging
     /// <summary>
     /// Remote object subtype.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<RemoteObjectSubtype>))]
     [DefaultEnumValue((int)Other)]
     public enum RemoteObjectSubtype
     {
diff --git a/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs
index 260b9a102..563559e87 100644
--- a/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs
+++ b/lib/PuppeteerSharp/Cdp/Messaging/RemoteObjectType.cs
@@ -1,3 +1,4 @@
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Cdp.Messaging
@@ -5,6 +6,7 @@ namespace PuppeteerSharp.Cdp.Messaging
     /// <summary>
     /// Remote object type.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<RemoteObjectType>))]
     [DefaultEnumValue((int)Other)]
     public enum RemoteObjectType
     {
diff --git a/lib/PuppeteerSharp/ConsoleType.cs b/lib/PuppeteerSharp/ConsoleType.cs
index 3c53c78b8..05631834e 100644
--- a/lib/PuppeteerSharp/ConsoleType.cs
+++ b/lib/PuppeteerSharp/ConsoleType.cs
@@ -1,10 +1,13 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Console type used on <see cref="ConsoleMessage"/>.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<ConsoleType>))]
     public enum ConsoleType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/CookiePriority.cs b/lib/PuppeteerSharp/CookiePriority.cs
index d64888768..3ab5f81dd 100644
--- a/lib/PuppeteerSharp/CookiePriority.cs
+++ b/lib/PuppeteerSharp/CookiePriority.cs
@@ -20,11 +20,15 @@
 //  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  * SOFTWARE.
 
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp;
 
 /// <summary>
 /// Represents the cookie's 'Priority' status.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumMemberConverter<CookiePriority>))]
 public enum CookiePriority
 {
     /// <summary>
diff --git a/lib/PuppeteerSharp/CookieSourceScheme.cs b/lib/PuppeteerSharp/CookieSourceScheme.cs
index 596b87b7d..06439f429 100644
--- a/lib/PuppeteerSharp/CookieSourceScheme.cs
+++ b/lib/PuppeteerSharp/CookieSourceScheme.cs
@@ -20,6 +20,9 @@
 //  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  * SOFTWARE.
 
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp;
 
 /// <summary>
@@ -27,6 +30,7 @@ namespace PuppeteerSharp;
 /// "Unset" allows protocol clients to emulate legacy cookie scope for the scheme.
 /// This is a temporary ability and it will be removed in the future.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumMemberConverter<CookieSourceScheme>))]
 public enum CookieSourceScheme
 {
     /// <summary>
diff --git a/lib/PuppeteerSharp/DOMWorldType.cs b/lib/PuppeteerSharp/DOMWorldType.cs
index 195d89497..5e83cc2c1 100644
--- a/lib/PuppeteerSharp/DOMWorldType.cs
+++ b/lib/PuppeteerSharp/DOMWorldType.cs
@@ -1,8 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<DOMWorldType>))]
     [DefaultEnumValue((int)Other)]
     internal enum DOMWorldType
     {
diff --git a/lib/PuppeteerSharp/DialogType.cs b/lib/PuppeteerSharp/DialogType.cs
index 7fc74ec68..2fa0e498a 100644
--- a/lib/PuppeteerSharp/DialogType.cs
+++ b/lib/PuppeteerSharp/DialogType.cs
@@ -1,4 +1,6 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
@@ -6,6 +8,7 @@ namespace PuppeteerSharp
     /// Dialog type.
     /// </summary>
     /// <seealso cref="Dialog"/>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<DialogType>))]
     public enum DialogType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Helpers/Json/JsonHelper.cs b/lib/PuppeteerSharp/Helpers/Json/JsonHelper.cs
index b9a843603..a4b791620 100644
--- a/lib/PuppeteerSharp/Helpers/Json/JsonHelper.cs
+++ b/lib/PuppeteerSharp/Helpers/Json/JsonHelper.cs
@@ -37,7 +37,7 @@ internal static class JsonHelper
 #endif
                 Converters =
                 {
-                    new HttpMethodConverter(), new JSHandleConverter(), new JsonStringEnumMemberConverter(),
+                    new HttpMethodConverter(), new JSHandleConverter(),
                 },
             };
         });
diff --git a/lib/PuppeteerSharp/Helpers/Json/JsonStringEnumMemberConverter.cs b/lib/PuppeteerSharp/Helpers/Json/JsonStringEnumMemberConverter.cs
index 3982494a8..d3b0db181 100644
--- a/lib/PuppeteerSharp/Helpers/Json/JsonStringEnumMemberConverter.cs
+++ b/lib/PuppeteerSharp/Helpers/Json/JsonStringEnumMemberConverter.cs
@@ -23,6 +23,7 @@
  */
 
 using System;
+using System.Collections.Concurrent;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -31,26 +32,28 @@ namespace PuppeteerSharp.Helpers.Json;
 /// <summary>
 /// Converts an enum value to or from a JSON string.
 /// </summary>
-internal sealed class JsonStringEnumMemberConverter : JsonConverterFactory
+/// <typeparam name="TEnum">The enum type.</typeparam>
+internal class JsonStringEnumMemberConverter<TEnum> : JsonConverterFactory
+    where TEnum : struct, Enum
 {
-    /// <inheritdoc />
-    public override bool CanConvert(Type typeToConvert)
-        => (typeToConvert.IsEnum || Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true) &&
-           !Attribute.IsDefined(typeToConvert, typeof(JsonStringIgnoreAttribute));
+    private static readonly ConcurrentDictionary<Type, JsonConverter> _jsonConverterCache = new();
 
-    /// <inheritdoc />
-    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    public static JsonConverter CreateJsonConverter()
     {
-        var nullableType = Nullable.GetUnderlyingType(typeToConvert);
-
-        return (JsonConverter)Activator.CreateInstance(
-            nullableType == null ?
-                typeof(EnumMemberConverter<>).MakeGenericType(typeToConvert) :
-                typeof(NullableEnumMemberConverter<>).MakeGenericType(nullableType));
+        var nullableType = Nullable.GetUnderlyingType(typeof(TEnum));
+        JsonConverter jsonConverter = nullableType == null ? new EnumMemberConverter<TEnum>() : new NullableEnumMemberConverter<TEnum>();
+        _jsonConverterCache.TryAdd(typeof(TEnum), jsonConverter);
+        return jsonConverter;
     }
 
-    private static TEnum? Read<TEnum>(ref Utf8JsonReader reader)
-        where TEnum : struct, Enum
+    public override bool CanConvert(Type typeToConvert)
+        => typeToConvert.IsEnum || Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true;
+
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        => _jsonConverterCache.TryGetValue(typeToConvert, out var jsonConverter) ? jsonConverter : CreateJsonConverter();
+
+    private static T? Read<T>(ref Utf8JsonReader reader)
+        where T : struct, Enum
     {
         if (reader.TokenType == JsonTokenType.Null)
         {
@@ -59,22 +62,22 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
 
         if (reader.TokenType == JsonTokenType.String)
         {
-            return EnumHelper.FromValueString<TEnum>(reader.GetString());
+            return EnumHelper.FromValueString<T>(reader.GetString());
         }
 
         if (reader.TokenType == JsonTokenType.Number)
         {
-            var enumTypeCode = Type.GetTypeCode(typeof(TEnum));
+            var enumTypeCode = Type.GetTypeCode(typeof(T));
             return enumTypeCode switch
             {
-                TypeCode.Int32 => (TEnum)(object)reader.GetInt32(),
-                TypeCode.Int64 => (TEnum)(object)reader.GetInt64(),
-                TypeCode.Int16 => (TEnum)(object)reader.GetInt16(),
-                TypeCode.Byte => (TEnum)(object)reader.GetByte(),
-                TypeCode.UInt32 => (TEnum)(object)reader.GetUInt32(),
-                TypeCode.UInt64 => (TEnum)(object)reader.GetUInt64(),
-                TypeCode.UInt16 => (TEnum)(object)reader.GetUInt16(),
-                TypeCode.SByte => (TEnum)(object)reader.GetSByte(),
+                TypeCode.Int32 => (T)(object)reader.GetInt32(),
+                TypeCode.Int64 => (T)(object)reader.GetInt64(),
+                TypeCode.Int16 => (T)(object)reader.GetInt16(),
+                TypeCode.Byte => (T)(object)reader.GetByte(),
+                TypeCode.UInt32 => (T)(object)reader.GetUInt32(),
+                TypeCode.UInt64 => (T)(object)reader.GetUInt64(),
+                TypeCode.UInt16 => (T)(object)reader.GetUInt16(),
+                TypeCode.SByte => (T)(object)reader.GetSByte(),
                 _ => throw new JsonException($"Enum '{typeof(TEnum).Name}' of {enumTypeCode} type is not supported."),
             };
         }
@@ -82,8 +85,8 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
         throw new JsonException();
     }
 
-    private static void Write<TEnum>(Utf8JsonWriter writer, TEnum? value)
-        where TEnum : struct, Enum
+    private static void Write<T>(Utf8JsonWriter writer, T? value)
+        where T : struct, Enum
     {
         if (value.HasValue)
         {
@@ -95,23 +98,23 @@ private static void Write<TEnum>(Utf8JsonWriter writer, TEnum? value)
         }
     }
 
-    private class EnumMemberConverter<TEnum> : JsonConverter<TEnum>
-        where TEnum : struct, Enum
+    private class EnumMemberConverter<T> : JsonConverter<T>
+        where T : struct, Enum
     {
-        public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            => Read<TEnum>(ref reader) ?? default;
+        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => Read<T>(ref reader) ?? default;
 
-        public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
-            => Write<TEnum>(writer, value);
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            => Write<T>(writer, value);
     }
 
-    private class NullableEnumMemberConverter<TEnum> : JsonConverter<TEnum?>
-        where TEnum : struct, Enum
+    private class NullableEnumMemberConverter<T> : JsonConverter<T?>
+        where T : struct, Enum
     {
-        public override TEnum? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            => Read<TEnum>(ref reader);
+        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => Read<T>(ref reader);
 
-        public override void Write(Utf8JsonWriter writer, TEnum? value, JsonSerializerOptions options)
-            => Write<TEnum>(writer, value);
+        public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+            => Write<T>(writer, value);
     }
 }
diff --git a/lib/PuppeteerSharp/Helpers/Json/SystemTextJsonSerializationContext.cs b/lib/PuppeteerSharp/Helpers/Json/SystemTextJsonSerializationContext.cs
index 85bcc1ca5..59d1821c5 100644
--- a/lib/PuppeteerSharp/Helpers/Json/SystemTextJsonSerializationContext.cs
+++ b/lib/PuppeteerSharp/Helpers/Json/SystemTextJsonSerializationContext.cs
@@ -205,6 +205,7 @@ namespace PuppeteerSharp.Helpers.Json;
 [JsonSerializable(typeof(TargetSendMessageToTargetRequest))]
 [JsonSerializable(typeof(TargetSetAutoAttachRequest))]
 [JsonSerializable(typeof(TargetSetDiscoverTargetsRequest))]
+[JsonSerializable(typeof(TargetType))]
 [JsonSerializable(typeof(TracingCompleteResponse))]
 [JsonSerializable(typeof(TracingStartRequest))]
 [JsonSerializable(typeof(WSEndpointResponse))]
diff --git a/lib/PuppeteerSharp/InitializationStatus.cs b/lib/PuppeteerSharp/InitializationStatus.cs
index 59d337fc3..69fc66d28 100644
--- a/lib/PuppeteerSharp/InitializationStatus.cs
+++ b/lib/PuppeteerSharp/InitializationStatus.cs
@@ -1,5 +1,9 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<InitializationStatus>))]
     internal enum InitializationStatus
     {
         Aborted,
diff --git a/lib/PuppeteerSharp/InitiatorType.cs b/lib/PuppeteerSharp/InitiatorType.cs
index f12aee3bd..88b5181a9 100644
--- a/lib/PuppeteerSharp/InitiatorType.cs
+++ b/lib/PuppeteerSharp/InitiatorType.cs
@@ -1,10 +1,13 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp;
 
 /// <summary>
 /// Type of the <see cref="Initiator"/>.
 /// </summary>
+[JsonConverter(typeof(JsonStringEnumMemberConverter<InitiatorType>))]
 public enum InitiatorType
 {
     /// <summary>
diff --git a/lib/PuppeteerSharp/Input/MouseButton.cs b/lib/PuppeteerSharp/Input/MouseButton.cs
index bbbf4ea26..a11d8797e 100644
--- a/lib/PuppeteerSharp/Input/MouseButton.cs
+++ b/lib/PuppeteerSharp/Input/MouseButton.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Input
 {
     /// <summary>
     /// The type of button click to use with <see cref="IMouse.DownAsync(ClickOptions)"/>, <see cref="IMouse.UpAsync(ClickOptions)"/> and <see cref="IMouse.ClickAsync(decimal, decimal, ClickOptions)"/>.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<MouseButton>))]
     [Flags]
 #pragma warning disable CA1714 // Flags enums should have plural names. We don't want to break compatibility for this
     public enum MouseButton
diff --git a/lib/PuppeteerSharp/Input/PointerType.cs b/lib/PuppeteerSharp/Input/PointerType.cs
index e736079b1..65262cd46 100644
--- a/lib/PuppeteerSharp/Input/PointerType.cs
+++ b/lib/PuppeteerSharp/Input/PointerType.cs
@@ -1,7 +1,10 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Input
 {
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<PointerType>))]
     internal enum PointerType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/InterceptResolutionAction.cs b/lib/PuppeteerSharp/InterceptResolutionAction.cs
index 2b37b7009..ec6244877 100644
--- a/lib/PuppeteerSharp/InterceptResolutionAction.cs
+++ b/lib/PuppeteerSharp/InterceptResolutionAction.cs
@@ -20,8 +20,12 @@
 //  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  * SOFTWARE.
 
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp;
 
+[JsonConverter(typeof(JsonStringEnumMemberConverter<InterceptResolutionAction>))]
 internal enum InterceptResolutionAction
 {
     Abort,
diff --git a/lib/PuppeteerSharp/Media/MediaType.cs b/lib/PuppeteerSharp/Media/MediaType.cs
index f093ccb08..6830e3127 100644
--- a/lib/PuppeteerSharp/Media/MediaType.cs
+++ b/lib/PuppeteerSharp/Media/MediaType.cs
@@ -1,10 +1,13 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Media
 {
     /// <summary>
     /// Media type.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<MediaType>))]
     public enum MediaType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/MediaFeature.cs b/lib/PuppeteerSharp/MediaFeature.cs
index 28435f3ed..b377274a9 100644
--- a/lib/PuppeteerSharp/MediaFeature.cs
+++ b/lib/PuppeteerSharp/MediaFeature.cs
@@ -1,10 +1,13 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Media Feature. See <see cref="IPage.EmulateMediaFeaturesAsync(System.Collections.Generic.IEnumerable{MediaFeatureValue})"/>.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<MediaFeature>))]
     public enum MediaFeature
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/Mobile/DeviceDescriptorName.cs b/lib/PuppeteerSharp/Mobile/DeviceDescriptorName.cs
index f0e9e9d74..025f3b1f8 100644
--- a/lib/PuppeteerSharp/Mobile/DeviceDescriptorName.cs
+++ b/lib/PuppeteerSharp/Mobile/DeviceDescriptorName.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp.Mobile
 {
     /// <summary>
     /// Device descriptor name.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<DeviceDescriptorName>))]
     public enum DeviceDescriptorName
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/OverridePermission.cs b/lib/PuppeteerSharp/OverridePermission.cs
index 50de3bed8..5f69614fd 100644
--- a/lib/PuppeteerSharp/OverridePermission.cs
+++ b/lib/PuppeteerSharp/OverridePermission.cs
@@ -1,4 +1,6 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
@@ -6,6 +8,7 @@ namespace PuppeteerSharp
     /// Override permission.
     /// </summary>
     /// <seealso cref="IBrowserContext.OverridePermissionsAsync(string, System.Collections.Generic.IEnumerable{OverridePermission})"/>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<OverridePermission>))]
     public enum OverridePermission
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/PageAccessibility/CheckedState.cs b/lib/PuppeteerSharp/PageAccessibility/CheckedState.cs
index f93b642c0..fc0110b93 100644
--- a/lib/PuppeteerSharp/PageAccessibility/CheckedState.cs
+++ b/lib/PuppeteerSharp/PageAccessibility/CheckedState.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp.PageAccessibility
 {
     /// <summary>
     /// Three-state boolean. See <seealso cref="SerializedAXNode.Checked"/> and. <seealso cref="SerializedAXNode.Pressed"/>
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<CheckedState>))]
     public enum CheckedState
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index c5ee49d4f..dbc981596 100644
--- a/lib/PuppeteerSharp/PuppeteerSharp.csproj
+++ b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -12,10 +12,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>19.0.0</PackageVersion>
-    <ReleaseVersion>19.0.0</ReleaseVersion>
-    <AssemblyVersion>19.0.0</AssemblyVersion>
-    <FileVersion>19.0.0</FileVersion>
+    <PackageVersion>19.0.1</PackageVersion>
+    <ReleaseVersion>19.0.1</ReleaseVersion>
+    <AssemblyVersion>19.0.1</AssemblyVersion>
+    <FileVersion>19.0.1</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <DebugType>embedded</DebugType>
diff --git a/lib/PuppeteerSharp/RequestAbortErrorCode.cs b/lib/PuppeteerSharp/RequestAbortErrorCode.cs
index fe55ce854..b06e1339f 100644
--- a/lib/PuppeteerSharp/RequestAbortErrorCode.cs
+++ b/lib/PuppeteerSharp/RequestAbortErrorCode.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Abort error codes. used by <see cref="IRequest.AbortAsync(RequestAbortErrorCode, int?)"/>.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<RequestAbortErrorCode>))]
     public enum RequestAbortErrorCode
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/ResourceType.cs b/lib/PuppeteerSharp/ResourceType.cs
index 09a9485eb..2c77cbc65 100644
--- a/lib/PuppeteerSharp/ResourceType.cs
+++ b/lib/PuppeteerSharp/ResourceType.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
@@ -7,6 +8,7 @@ namespace PuppeteerSharp
     /// Resource type.
     /// </summary>
     /// <seealso cref="IRequest.ResourceType"/>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<ResourceType>))]
     [DefaultEnumValue((int)Unknown)]
     public enum ResourceType
     {
diff --git a/lib/PuppeteerSharp/SameSite.cs b/lib/PuppeteerSharp/SameSite.cs
index b706a125b..ffd818424 100644
--- a/lib/PuppeteerSharp/SameSite.cs
+++ b/lib/PuppeteerSharp/SameSite.cs
@@ -1,3 +1,4 @@
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
@@ -5,6 +6,7 @@ namespace PuppeteerSharp
     /// <summary>
     /// SameSite values in cookies.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<SameSite>))]
     [DefaultEnumValue((int)None)]
     public enum SameSite
     {
diff --git a/lib/PuppeteerSharp/ScreenshotType.cs b/lib/PuppeteerSharp/ScreenshotType.cs
index bc77dc17a..cd0048e91 100644
--- a/lib/PuppeteerSharp/ScreenshotType.cs
+++ b/lib/PuppeteerSharp/ScreenshotType.cs
@@ -1,9 +1,13 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Screenshot file type.
     /// </summary>
     /// <seealso cref="ScreenshotOptions"/>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<ScreenshotType>))]
     public enum ScreenshotType
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/TargetType.cs b/lib/PuppeteerSharp/TargetType.cs
index 976aae596..e5c7d872e 100644
--- a/lib/PuppeteerSharp/TargetType.cs
+++ b/lib/PuppeteerSharp/TargetType.cs
@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
@@ -6,6 +7,7 @@ namespace PuppeteerSharp
     /// <summary>
     /// Target type.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<TargetType>))]
     [DefaultEnumValue((int)Other)]
     public enum TargetType
     {
diff --git a/lib/PuppeteerSharp/VisionDeficiency.cs b/lib/PuppeteerSharp/VisionDeficiency.cs
index 618043e13..7d9b68246 100644
--- a/lib/PuppeteerSharp/VisionDeficiency.cs
+++ b/lib/PuppeteerSharp/VisionDeficiency.cs
@@ -1,10 +1,13 @@
 using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Types of vision deficiency to emulate using <see cref="IPage.EmulateVisionDeficiencyAsync(VisionDeficiency)"/>.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<VisionDeficiency>))]
     public enum VisionDeficiency
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/WaitForFunctionPollingOption.cs b/lib/PuppeteerSharp/WaitForFunctionPollingOption.cs
index a77dc08aa..2ca8735b4 100644
--- a/lib/PuppeteerSharp/WaitForFunctionPollingOption.cs
+++ b/lib/PuppeteerSharp/WaitForFunctionPollingOption.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp
 {
     /// <summary>
     /// An interval at which the <c>pageFunction</c> is executed.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<WaitForFunctionPollingOption>))]
     public enum WaitForFunctionPollingOption
     {
         /// <summary>
diff --git a/lib/PuppeteerSharp/WaitUntilNavigation.cs b/lib/PuppeteerSharp/WaitUntilNavigation.cs
index dfbdac1bf..0f6def3bc 100644
--- a/lib/PuppeteerSharp/WaitUntilNavigation.cs
+++ b/lib/PuppeteerSharp/WaitUntilNavigation.cs
@@ -1,8 +1,12 @@
+using System.Text.Json.Serialization;
+using PuppeteerSharp.Helpers.Json;
+
 namespace PuppeteerSharp
 {
     /// <summary>
     /// Wait until navigation.
     /// </summary>
+    [JsonConverter(typeof(JsonStringEnumMemberConverter<WaitUntilNavigation>))]
     public enum WaitUntilNavigation
     {
         /// <summary>