diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 58313988bd6..3feea3a6904 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-15 Bogdan Gheorghe
+	Disable background type cache on startup for now
+	
+	* src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
+	
 2004-06-14 Bogdan Gheorghe
 	Fix for Bug 66748: Fixed in head - we now add a _cdtsrchlink_ label to all 
 	imports brought in by search and ensure that we don't delete any local files.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
index 30d9074db3a..0e147f1cc60 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java
@@ -181,6 +181,12 @@ public class WorkInProgressPreferencePage extends PreferencePage
 	 */
 	public static void initDefaults(IPreferenceStore store) {
 		store.setDefault(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, false);
+		Preferences prefs = CCorePlugin.getDefault().getPluginPreferences();
+		
+		if (prefs != null){
+			prefs.setValue(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE, store.getString(AllTypesCache.ENABLE_BACKGROUND_TYPE_CACHE));
+			CCorePlugin.getDefault().savePluginPreferences();
+		}
 	}
 	
 	/*