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 287d1cb9b..4ea977d42 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
@@ -320,7 +320,7 @@ public class TerminologyCache {
     if (system.startsWith("urn:iso:std:iso:"))
       return "iso"+system.substring(16).replace(":", "");
     if (system.startsWith("http://terminology.hl7.org/CodeSystem/"))
-      return system.substring(38).replace("/", "");
+      return system.substring(38).replace("/", "").replace('|','X');
     if (system.startsWith("http://hl7.org/fhir/"))
       return system.substring(20).replace("/", "");
     if (system.equals("urn:ietf:bcp:47"))
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360X2.7.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360X2.7.cache
new file mode 100644
index 000000000..00f2436f5
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360X2.7.cache
@@ -0,0 +1,12 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.7",
+  "code" : "BS",
+  "display" : "Bachelor of Science"
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}####
+v: {
+  "display" : "Bachelor of Science",
+  "code" : "BS",
+  "system" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.7"
+}
+-------------------------------------------------------------------------------------