diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
index 1aa573eb5..2c0edb4d4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@@ -3161,8 +3161,8 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
     if (class_ == ValueSet.class) {
       SourcedValueSet svs = null;
       if (txCache.hasValueSet(canonical)) {
-        System.out.println("doFindTxResource - in cache");
         svs = txCache.getValueSet(canonical);
+        System.out.println("doFindTxResource - in cache from "+svs.getServer());
       } else {
         System.out.println("doFindTxResource - not in cache");
         svs = terminologyClientManager.findValueSetOnServer(canonical);
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java
index 326e35904..bdcf5cd07 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java
@@ -847,7 +847,7 @@ public class TerminologyCache {
             vsCache.put(p.getName(), null);
           } else {
             org.hl7.fhir.utilities.json.model.JsonObject j = p.getValue().asJsonObject();
-            vsCache.put(p.getName(), new SourcedValueSetEntry(j.asString("filename"), j.asString("server")));        
+            vsCache.put(p.getName(), new SourcedValueSetEntry(j.asString("server"), j.asString("filename")));        
           }
         }
       }
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-db2cdc27-160a-4752-bb5f-4d0e2ba3f2af.json b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-85f7fe3d-bb1d-4112-ada7-72c47bf4b237.json
similarity index 94%
rename from org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-db2cdc27-160a-4752-bb5f-4d0e2ba3f2af.json
rename to org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-85f7fe3d-bb1d-4112-ada7-72c47bf4b237.json
index cfa9bd993..304b99b40 100644
--- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-db2cdc27-160a-4752-bb5f-4d0e2ba3f2af.json
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-85f7fe3d-bb1d-4112-ada7-72c47bf4b237.json
@@ -1 +1 @@
-{"resourceType":"ValueSet","id":"australian-immunisation-register-vaccine-1","meta":{"versionId":"1","lastUpdated":"2024-01-15T17:04:46.941+10:00","profile":["http://hl7.org/fhir/StructureDefinition/shareablevalueset","https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"]},"text":{"status":"generated","div":"<div xmlns=\"http://www.w3.org/1999/xhtml\"><h2>Australian Immunisation Register Vaccine</h2><tt>https://healthterminologies.gov.au/fhir/ValueSet/australian-immunisation-register-vaccine-1</tt><p>The Australian Immunisation Register Vaccine value set includes values that may be used to represent a vaccine product according to the Australian Immunisation Register vaccine code formats.</p></div>"},"url":"https://healthterminologies.gov.au/fhir/ValueSet/australian-immunisation-register-vaccine-1","identifier":[{"system":"urn:ietf:rfc:3986","value":"urn:oid:1.2.36.1.2001.1004.201.10043"}],"version":"1.0.2","name":"AustralianImmunisationRegisterVaccine","title":"Australian Immunisation Register Vaccine","status":"active","experimental":false,"date":"2020-05-31","publisher":"Australian Digital Health Agency","contact":[{"telecom":[{"system":"email","value":"help@digitalhealth.gov.au"}]}],"description":"The Australian Immunisation Register Vaccine value set includes values that may be used to represent a vaccine product according to the Australian Immunisation Register vaccine code formats.","copyright":"Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource also includes material from the ‘Australian Immunisation Register Vaccine Code Formats last updated: 7 February 2018 © Commonwealth of Australia, represented by the Department of Human Services https://www.humanservices.gov.au/organisations/health-professionals/enablers/air-vaccine-code-formats. Licensed under https://creativecommons.org/licenses/by/3.0/au). \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.","compose":{"include":[{"system":"https://www.humanservices.gov.au/organisations/health-professionals/enablers/air-vaccine-code-formats"}]}}
\ No newline at end of file
+{"resourceType":"ValueSet","id":"australian-immunisation-register-vaccine-1","meta":{"versionId":"1","lastUpdated":"2023-12-19T15:48:35.208+10:00","profile":["http://hl7.org/fhir/StructureDefinition/shareablevalueset","https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4"]},"text":{"status":"generated","div":"<div xmlns=\"http://www.w3.org/1999/xhtml\"><h2>Australian Immunisation Register Vaccine</h2><tt>https://healthterminologies.gov.au/fhir/ValueSet/australian-immunisation-register-vaccine-1</tt><p>The Australian Immunisation Register Vaccine value set includes values that may be used to represent a vaccine product according to the Australian Immunisation Register vaccine code formats.</p></div>"},"url":"https://healthterminologies.gov.au/fhir/ValueSet/australian-immunisation-register-vaccine-1","identifier":[{"system":"urn:ietf:rfc:3986","value":"urn:oid:1.2.36.1.2001.1004.201.10043"}],"version":"1.0.2","name":"AustralianImmunisationRegisterVaccine","title":"Australian Immunisation Register Vaccine","status":"active","experimental":false,"date":"2020-05-31","publisher":"Australian Digital Health Agency","contact":[{"telecom":[{"system":"email","value":"help@digitalhealth.gov.au"}]}],"description":"The Australian Immunisation Register Vaccine value set includes values that may be used to represent a vaccine product according to the Australian Immunisation Register vaccine code formats.","copyright":"Copyright © 2018 Australian Digital Health Agency - All rights reserved. Except for the material identified below, this content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/. \n\nThis resource also includes material from the ‘Australian Immunisation Register Vaccine Code Formats last updated: 7 February 2018 © Commonwealth of Australia, represented by the Department of Human Services https://www.humanservices.gov.au/organisations/health-professionals/enablers/air-vaccine-code-formats. Licensed under https://creativecommons.org/licenses/by/3.0/au). \n\nAll copies of this resource must include this copyright statement and all information contained in this statement.","compose":{"include":[{"system":"https://www.humanservices.gov.au/organisations/health-professionals/enablers/air-vaccine-code-formats"}]}}
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-externals.json b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-externals.json
index 3cd14fe78..f183de4c3 100644
--- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-externals.json
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/vs-externals.json
@@ -1,14 +1,6 @@
 {
-  "http://loinc.org/vs/LL378-1" : null,
-  "http://www.rfc-editor.org/bcp/bcp13.txt" : null,
-  "http://loinc.org/vs/LL1971-2" : null,
-  "http://fhir.ch/ig/ch-ig/ValueSet/ch-ig-example" : null,
-  "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" : null,
   "https://healthterminologies.gov.au/fhir/ValueSet/australian-immunisation-register-vaccine-1" : {
     "server" : "https://tx.ontoserver.csiro.au/fhir",
-    "filename" : "vs-db2cdc27-160a-4752-bb5f-4d0e2ba3f2af.json"
-  },
-  "http://fhir.ch/ig/ch-ig/ValueSet/OrganizationType" : null,
-  "http://loinc.org/vs/LL4048-6" : null,
-  "https://fhir.kbv.de/ValueSet/KBV_VS_SFHIR_ICD_SEITENLOKALISATION" : null
+    "filename" : "vs-85f7fe3d-bb1d-4112-ada7-72c47bf4b237.json"
+  }
 }