diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
index f9ca3f97734..76a47282fce 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java
@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.Plugin;
  * The main plugin class to be used in the desktop.
  */
 public class MakeCorePlugin extends Plugin {
+	public static final String OLD_BUILDER_ID = "org.eclipse.cdt.core.cbuilder";
 	//The shared instance.
 	private static MakeCorePlugin plugin;
 	//Resource bundle.
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
index c39f12080c6..fd69715eeaf 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
@@ -59,7 +59,7 @@ public class MakeScannerProvider extends AbstractCExtension implements IScannerI
 		return defaultProvider;
 	}
 	
-	public MakeScannerInfo getMakeScannerInfo(IProject project) throws CoreException {
+	public MakeScannerInfo getMakeScannerInfo(IProject project, boolean cacheInfo) throws CoreException {
 		MakeScannerInfo scannerInfo = null;
 		// See if there's already one associated with the resource for this session
 		scannerInfo = (MakeScannerInfo)project.getSessionProperty(scannerInfoProperty);
@@ -71,7 +71,7 @@ public class MakeScannerProvider extends AbstractCExtension implements IScannerI
 
 		// There is nothing persisted for the session, or saved in a file so 
 		// create a build info object
-		if (scannerInfo != null) {
+		if (scannerInfo != null && cacheInfo == true) {
 			((IProject)project).setSessionProperty(scannerInfoProperty, scannerInfo);
 		}
 		return scannerInfo;
@@ -110,7 +110,7 @@ public class MakeScannerProvider extends AbstractCExtension implements IScannerI
 	public IScannerInfo getScannerInformation(IResource resource) {
 		IScannerInfo info = null;
 		try {
-			info = getMakeScannerInfo((IProject)resource);
+			info = getMakeScannerInfo((IProject)resource, true);
 		} catch (CoreException e) {
 		}
 		return info;