diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java
index 3760039a63d..b01a140f8b6 100644
--- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java
+++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/cache/ResourceVersionMap.java
@@ -60,7 +60,7 @@ public class ResourceVersionMap {
 
 	public static ResourceVersionMap fromResourcePersistentIds(List<ResourcePersistentId> theResourcePersistentIds) {
 		ResourceVersionMap retval = new ResourceVersionMap();
-		theResourcePersistentIds.forEach(resource -> retval.add(resource.getAssociatedResourceId()));
+		theResourcePersistentIds.forEach(resourcePersistentId -> retval.add(resourcePersistentId.getAssociatedResourceId()));
 		return retval;
 	}
 
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/ResourcePersistentId.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/ResourcePersistentId.java
index 1a45a9c9256..801d83b9b47 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/ResourcePersistentId.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/storage/ResourcePersistentId.java
@@ -125,4 +125,10 @@ public class ResourcePersistentId {
 		}
 		return retVal;
 	}
+
+	public static ResourcePersistentId fromIIdType(IIdType theId) {
+		ResourcePersistentId retval = new ResourcePersistentId(theId);
+		retval.setAssociatedResourceId(theId);
+		return retval;
+	}
 }