diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java
index ea46412e5..ad518025b 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java
@@ -238,6 +238,8 @@ public class TerminologyCacheTests implements ResourceLoaderTests {
     assertTrue(cacheToken.hasVersion());
   }
 
+
+
   @Test
   public void testCodableConceptCacheTokenGeneration() throws IOException, URISyntaxException {
 
@@ -453,4 +455,20 @@ public class TerminologyCacheTests implements ResourceLoaderTests {
 
     assertEquals("http://dummy.org", extracted);
   }
+
+  @Test
+  public void testCodingWithSystemCacheTokenGenerationWithPipeCharSystem() throws IOException, URISyntaxException {
+
+    TerminologyCache terminologyCache = createTerminologyCache();
+    ValueSet valueSet = new ValueSet();
+
+    Coding coding = new Coding();
+    coding.setCode("dummyCode");
+    coding.setSystem("http://terminology.hl7.org/CodeSystem/dummy|System");
+    coding.setVersion("dummyVersion");
+    TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions,
+      coding, valueSet);
+    assertEquals("dummyXSystem", cacheToken.getName());
+    assertTrue(cacheToken.hasVersion());
+  }
 }