diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
index e7fa2eea3bb..2e239e4a896 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
@@ -414,10 +414,11 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
 	
 	public PathEntryResolveInfo getResolveInfo(ICProject cproject, boolean useCache) throws CModelException{
 		PathEntryResolveInfo info = (PathEntryResolveInfo)resolvedInfoMap.get(cproject);
-		if(info == null){
+		if(info == null && useCache){
 			getResolvedPathEntries(cproject);
 			info = (PathEntryResolveInfo)resolvedInfoMap.get(cproject);
-		} else if(!useCache || !getResolveInfoValidState(cproject)){
+		}
+		if(info == null || !useCache || !getResolveInfoValidState(cproject)){
 			Object[] resolved = getResolvedPathEntries(cproject, false, false);
 			if(resolved != null)
 				info = (PathEntryResolveInfo)resolved[1];