diff --git a/src/main/java/net/openhft/chronicle/wire/CSVWire.java b/src/main/java/net/openhft/chronicle/wire/CSVWire.java
index b20d02320..9717be070 100644
--- a/src/main/java/net/openhft/chronicle/wire/CSVWire.java
+++ b/src/main/java/net/openhft/chronicle/wire/CSVWire.java
@@ -27,6 +27,7 @@
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 /**
  * YAML Based wire format
@@ -34,6 +35,7 @@
 public class CSVWire extends TextWire {
 
     private static final ThreadLocal<WeakReference<StopCharTester>> ESCAPED_END_OF_TEXT = new ThreadLocal<>();
+    static final Supplier<StopCharTester> COMMA_STOP_ESCAPING = StopCharTesters.COMMA_STOP::escaping;
 
     private final List<String> header = new ArrayList<>();
 
@@ -65,8 +67,7 @@ public static CSVWire from(@NotNull String text) {
 
     @NotNull
     static StopCharTester getEscapingCSVEndOfText() {
-        StopCharTester escaping = ThreadLocalHelper.getTL(ESCAPED_END_OF_TEXT,
-                StopCharTesters.COMMA_STOP::escaping);
+        StopCharTester escaping = ThreadLocalHelper.getTL(ESCAPED_END_OF_TEXT, COMMA_STOP_ESCAPING);
         // reset it.
         escaping.isStopChar(' ');
         return escaping;
diff --git a/src/main/java/net/openhft/chronicle/wire/JSONWire.java b/src/main/java/net/openhft/chronicle/wire/JSONWire.java
index 456d0442b..0d936d33b 100644
--- a/src/main/java/net/openhft/chronicle/wire/JSONWire.java
+++ b/src/main/java/net/openhft/chronicle/wire/JSONWire.java
@@ -19,6 +19,7 @@
 
 import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.chronicle.bytes.BytesStore;
+import net.openhft.chronicle.bytes.StopCharsTester;
 import net.openhft.chronicle.core.Jvm;
 import net.openhft.chronicle.core.io.IORuntimeException;
 import net.openhft.chronicle.core.util.ClassNotFoundRuntimeException;
@@ -32,6 +33,7 @@
 import java.time.LocalTime;
 import java.util.Map;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
 
 import static net.openhft.chronicle.bytes.NativeBytes.nativeBytes;
 
@@ -43,6 +45,7 @@
 public class JSONWire extends TextWire {
     @SuppressWarnings("rawtypes")
     static final BytesStore COMMA = BytesStore.from(",");
+    static final Supplier<StopCharsTester> STRICT_END_OF_TEXT_JSON_ESCAPING = TextStopCharsTesters.STRICT_END_OF_TEXT_JSON::escaping;
     boolean useTypes;
 
     @SuppressWarnings("rawtypes")
@@ -201,11 +204,18 @@ protected StringBuilder readField(@NotNull StringBuilder sb) {
     }
 
     @Override
+    @Deprecated(/* To be removed in 2.24 */)
     @NotNull
     protected TextStopCharsTesters strictEndOfText() {
         return TextStopCharsTesters.STRICT_END_OF_TEXT_JSON;
     }
 
+    @Override
+    @NotNull
+    protected Supplier<StopCharsTester> strictEndOfTextEscaping() {
+        return STRICT_END_OF_TEXT_JSON_ESCAPING;
+    }
+
     class JSONValueOut extends TextValueOut {
         @NotNull
         @Override
diff --git a/src/main/java/net/openhft/chronicle/wire/TextWire.java b/src/main/java/net/openhft/chronicle/wire/TextWire.java
index b1732a59f..3278da1a3 100644
--- a/src/main/java/net/openhft/chronicle/wire/TextWire.java
+++ b/src/main/java/net/openhft/chronicle/wire/TextWire.java
@@ -77,6 +77,11 @@ public class TextWire extends AbstractWire implements Wire {
     static final BytesStore END_FIELD = NEW_LINE;
     static final char[] HEXADECIMAL = "0123456789ABCDEF".toCharArray();
     static final Pattern REGX_PATTERN = Pattern.compile("\\.|\\$");
+    static final Supplier<StopCharTester> QUOTES_ESCAPING = StopCharTesters.QUOTES::escaping;
+    static final Supplier<StopCharTester> SINGLE_QUOTES_ESCAPING = StopCharTesters.SINGLE_QUOTES::escaping;
+    static final Supplier<StopCharTester> END_OF_TEXT_ESCAPING = TextStopCharTesters.END_OF_TEXT::escaping;
+    static final Supplier<StopCharsTester> STRICT_END_OF_TEXT_ESCAPING = TextStopCharsTesters.STRICT_END_OF_TEXT::escaping;
+    static final Supplier<StopCharsTester> END_EVENT_NAME_ESCAPING = TextStopCharsTesters.END_EVENT_NAME::escaping;
 
     static {
         IOTools.unmonitor(TYPE);
@@ -204,8 +209,7 @@ public static <ACS extends Appendable & CharSequence> void unescape(@NotNull ACS
 
     @Nullable
     static StopCharTester getEscapingSingleQuotes() {
-        StopCharTester sct = ThreadLocalHelper.getTL(ESCAPED_SINGLE_QUOTES,
-                StopCharTesters.SINGLE_QUOTES::escaping);
+        StopCharTester sct = ThreadLocalHelper.getTL(ESCAPED_SINGLE_QUOTES, SINGLE_QUOTES_ESCAPING);
         // reset it.
         sct.isStopChar(' ');
         return sct;
@@ -539,8 +543,7 @@ private <K> K toExpected(Class<K> expectedClass, StringBuilder sb) {
 
     @NotNull
     protected StopCharTester getEscapingEndOfText() {
-        StopCharTester escaping = ThreadLocalHelper.getTL(ESCAPED_END_OF_TEXT,
-                TextStopCharTesters.END_OF_TEXT::escaping);
+        StopCharTester escaping = ThreadLocalHelper.getTL(ESCAPED_END_OF_TEXT, END_OF_TEXT_ESCAPING);
         // reset it.
         escaping.isStopChar(' ');
         return escaping;
@@ -548,23 +551,27 @@ protected StopCharTester getEscapingEndOfText() {
 
     @NotNull
     protected StopCharsTester getStrictEscapingEndOfText() {
-        TextStopCharsTesters strictEndOfText = strictEndOfText();
-        StopCharsTester escaping = ThreadLocalHelper.getTL(STRICT_ESCAPED_END_OF_TEXT,
-                strictEndOfText::escaping);
+        StopCharsTester escaping = ThreadLocalHelper.getTL(STRICT_ESCAPED_END_OF_TEXT, strictEndOfTextEscaping());
         // reset it.
         escaping.isStopChar(' ', ' ');
         return escaping;
     }
 
     @NotNull
+    @Deprecated(/* To be removed in 2.24 - use strictEndOfTextEscaping */)
     protected TextStopCharsTesters strictEndOfText() {
         return TextStopCharsTesters.STRICT_END_OF_TEXT;
     }
 
+    @NotNull
+    protected Supplier<StopCharsTester> strictEndOfTextEscaping() {
+        return strictEndOfText() == TextStopCharsTesters.STRICT_END_OF_TEXT ?
+                STRICT_END_OF_TEXT_ESCAPING : strictEndOfText()::escaping;
+    }
+
     @NotNull
     protected StopCharsTester getEscapingEndEventName() {
-        StopCharsTester escaping = ThreadLocalHelper.getTL(STRICT_ESCAPED_END_OF_TEXT,
-                TextStopCharsTesters.END_EVENT_NAME::escaping);
+        StopCharsTester escaping = ThreadLocalHelper.getTL(STRICT_ESCAPED_END_OF_TEXT, END_EVENT_NAME_ESCAPING);
         // reset it.
         escaping.isStopChar(' ', ' ');
         return escaping;
@@ -572,8 +579,7 @@ protected StopCharsTester getEscapingEndEventName() {
 
     @Nullable
     protected StopCharTester getEscapingQuotes() {
-        StopCharTester sct = ThreadLocalHelper.getTL(ESCAPED_QUOTES,
-                StopCharTesters.QUOTES::escaping);
+        StopCharTester sct = ThreadLocalHelper.getTL(ESCAPED_QUOTES, QUOTES_ESCAPING);
         // reset it.
         sct.isStopChar(' ');
         return sct;