diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java
index 5560d8f1a4..e0a051395c 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/ProvisioningContext.java
@@ -208,18 +208,22 @@ private void getLoadedRepository(URI location, IArtifactRepositoryManager repoMa
 	}
 
 	private Set<IMetadataRepository> getLoadedMetadataRepositories(IProgressMonitor monitor) {
-		IMetadataRepositoryManager repoManager = agent.getService(IMetadataRepositoryManager.class);
-		URI[] repositories = metadataRepositories == null ? repoManager.getKnownRepositories(IRepositoryManager.REPOSITORIES_ALL) : metadataRepositories;
-
-		Map<String, IMetadataRepository> repos = new HashMap<>();
-		SubMonitor sub = SubMonitor.convert(monitor, repositories.length);
-
-		// Clear out the list of remembered artifact repositories
-		referencedArtifactRepositories = new HashMap<>();
-		for (URI repositorie : repositories) {
-			loadMetadataRepository(repoManager, repositorie, repos, shouldFollowReferences(), sub.split(1));
+		if (loadedRepos == null) {
+			IMetadataRepositoryManager repoManager = agent.getService(IMetadataRepositoryManager.class);
+			URI[] repositories = metadataRepositories == null
+					? repoManager.getKnownRepositories(IRepositoryManager.REPOSITORIES_ALL)
+					: metadataRepositories;
+
+			loadedRepos = new HashMap<>();
+			SubMonitor sub = SubMonitor.convert(monitor, repositories.length);
+
+			// Clear out the list of remembered artifact repositories
+			referencedArtifactRepositories = new HashMap<>();
+			for (URI repository : repositories) {
+				loadMetadataRepository(repoManager, repository, loadedRepos, shouldFollowReferences(), sub.split(1));
+			}
 		}
-		return new HashSet<>(repos.values());
+		return new HashSet<>(loadedRepos.values());
 	}
 
 	private void loadMetadataRepository(IMetadataRepositoryManager manager, URI location,
@@ -406,6 +410,7 @@ private <T, R extends IRepository<T>> void loadRepository(IRepositoryManager<T>
 	private static final Comparator<IArtifactKey> ARTIFACT_KEY_COMPARATOR = Comparator //
 			.comparing(IArtifactKey::getId) //
 			.thenComparing(IArtifactKey::getVersion);
+	private Map<String, IMetadataRepository> loadedRepos;
 
 	/**
 	 * Returns a map from simple artifact repository location to a subset of the
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java
index 4fe0b58794..adb8b19c44 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningContextTest.java
@@ -22,7 +22,10 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
 import org.eclipse.equinox.p2.planner.IProfileChangeRequest;
-import org.eclipse.equinox.p2.query.*;
+import org.eclipse.equinox.p2.query.ExpressionMatchQuery;
+import org.eclipse.equinox.p2.query.IQuery;
+import org.eclipse.equinox.p2.query.IQueryable;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.p2.repository.IRepository;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
@@ -199,6 +202,12 @@ public void testFollowHelpsResolve() {
 		context.setArtifactRepositories(new URI[0]);
 		IProvisioningPlan plan = getPlanner(getAgent()).getProvisioningPlan(request, context, getMonitor());
 		assertFalse("resolve should fail with missing requirements", plan.getStatus().isOK());
+		// we need to create a new context as the planner is calling
+		// ProvisioningContext.getMetadata(IProgressMonitor) and after that call
+		// repositories are fixed as per API...
+		context = new ProvisioningContext(getAgent());
+		context.setMetadataRepositories(new URI[] { repoA.getLocation() });
+		context.setArtifactRepositories(new URI[0]);
 		context.setProperty(ProvisioningContext.FOLLOW_REPOSITORY_REFERENCES, "true");
 		plan = getPlanner(getAgent()).getProvisioningPlan(request, context, getMonitor());
 		assertTrue("resolve should pass", plan.getStatus().isOK());