diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java
index 13b7ffb09c8..a03ad056cd9 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java
@@ -70,7 +70,9 @@ public Object getInfo(ICElement element) {
 		case ICElement.C_PROJECT:
 			return this.projectAndRootCache.get(element);
 		case ICElement.C_CCONTAINER:
-			return this.folderCache.get(element);		
+			return this.folderCache.get(element);
+		case ICElement.C_ARCHIVE:
+		case ICElement.C_BINARY:		
 		case ICElement.C_UNIT:
 			return this.fileCache.get(element);
 		default:
@@ -89,6 +91,8 @@ protected Object peekAtInfo(ICElement element) {
 			return this.projectAndRootCache.get(element);
 		case ICElement.C_CCONTAINER:
 			return this.folderCache.get(element);
+		case ICElement.C_ARCHIVE:
+		case ICElement.C_BINARY:		
 		case ICElement.C_UNIT:
 			return this.fileCache.peek(element);
 		default:
@@ -108,6 +112,8 @@ protected void putInfo(ICElement element, Object info) {
 		case ICElement.C_CCONTAINER:
 			this.folderCache.put(element, info);
 			break;
+		case ICElement.C_ARCHIVE:
+		case ICElement.C_BINARY:		
 		case ICElement.C_UNIT:
 			this.fileCache.put(element, info);
 			break;
@@ -127,6 +133,8 @@ protected void removeInfo(ICElement element) {
 		case ICElement.C_CCONTAINER:
 			this.folderCache.remove(element);
 			break;
+		case ICElement.C_ARCHIVE:
+		case ICElement.C_BINARY:		
 		case ICElement.C_UNIT:
 			this.fileCache.remove(element);
 			break;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java
index 316b890cb4c..8b54b5d6581 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelInfo.java
@@ -13,11 +13,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
  */
 public class CModelInfo extends CContainerInfo {
 
-	/**
-	 * A array with all the non-java projects contained by this model
-	 */
-	Object[] nonCResources;
-
 	/**
 	 * Constructs a new C Model Info 
 	 */
@@ -53,13 +48,10 @@ public class CModelInfo extends CContainerInfo {
 	 * Returns an array of non-C resources contained in the receiver.
 	 */
 	Object[] getNonCResources() {
-
-		Object[] resources = nonCResources;
-		if (resources == null) {
-			resources = computeNonCResources();
-			nonCResources = resources;
+		if (nonCResources == null) {
+			nonCResources = computeNonCResources();
 		}
-		return resources;
+		return nonCResources;
 	}
 
 }