diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java
index 5b589e05e..0740792e7 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java
@@ -125,10 +125,10 @@ public class TerminologyCache {
   private static boolean cacheErrors;
 
   static {
-    String cacheErrorsProperty = System.getProperty("cacheErrors");
-    cacheErrors = cacheErrorsProperty != null ? "TRUE".equals(cacheErrorsProperty.toUpperCase(Locale.ROOT)) : false;
+    String cacheErrorsProperty = System.getProperty("fhir.txcache.cacheErrors");
+    cacheErrors = cacheErrorsProperty != null && "TRUE".equals(cacheErrorsProperty.toUpperCase(Locale.ROOT));
   }
-  
+
   // use lock from the context
   public TerminologyCache(Object lock, String folder) throws FileNotFoundException, IOException, FHIRException {
     super();
@@ -137,10 +137,12 @@ public class TerminologyCache {
     requestCount = 0;
     hitCount = 0;
     networkCount = 0;
-    if (folder != null)
+
+    if (folder != null) {
       load();
+    }
   }
-  
+
   public void clear() {
     caches.clear();
   }
diff --git a/pom.xml b/pom.xml
index 64a8d06ca..8e66079d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,7 +373,7 @@
                                 <exclude>org/hl7/fhir/validation/cli/**</exclude>
                             </excludes>
                             <systemPropertyVariables>
-                                <cacheErrors>TRUE</cacheErrors>
+                                <fhir.txcache.cacheErrors>TRUE</fhir.txcache.cacheErrors>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -405,7 +405,7 @@
                                 <exclude>org/hl7/fhir/validation/cli/**</exclude>
                             </excludes>
                             <systemPropertyVariables>
-                                <cacheErrors>TRUE</cacheErrors>
+                                <fhir.txcache.cacheErrors>TRUE</fhir.txcache.cacheErrors>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>