Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1046
diff -u -p -r1.1046 common.inc
--- includes/common.inc	12 Nov 2009 20:40:27 -0000	1.1046
+++ includes/common.inc	13 Nov 2009 13:58:23 -0000
@@ -6236,7 +6236,7 @@ function entity_get_info($entity_type = 
   $entity_info = &drupal_static(__FUNCTION__, array());
 
   if (empty($entity_info)) {
-    if ($cache = cache_get('entity_info')) {
+    if ($cache = cache_get('entity_info', 'cache_bootstrap')) {
       $entity_info = $cache->data;
     }
     else {
@@ -6265,7 +6265,7 @@ function entity_get_info($entity_type = 
       }
       // Let other modules alter the entity info.
       drupal_alter('entity_info', $entity_info);
-      cache_set('entity_info', $entity_info);
+      cache_set('entity_info', $entity_info, 'cache_bootstrap');
     }
   }
 
Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.28
diff -u -p -r1.28 field.info.inc
--- modules/field/field.info.inc	13 Nov 2009 11:59:14 -0000	1.28
+++ modules/field/field.info.inc	13 Nov 2009 13:58:23 -0000
@@ -27,7 +27,7 @@ function field_info_cache_clear() {
   // @todo: Remove this when field_attach_*_bundle() bundle management
   // functions are moved to the entity API.
   drupal_static_reset('entity_get_info');
-  cache_clear_all('entity_info', 'cache');
+  cache_clear_all('entity_info', 'cache_bootstrap');
 
   _field_info_collate_types(TRUE);
   drupal_static_reset('field_build_modes');
@@ -64,12 +64,12 @@ function _field_info_collate_types($rese
 
   if ($reset) {
     $info = NULL;
-    cache_clear_all('field_info_types', 'cache_field');
+    cache_clear_all('field_info_types', 'cache_bootstrap');
     return;
   }
 
   if (!isset($info)) {
-    if ($cached = cache_get('field_info_types', 'cache_field')) {
+    if ($cached = cache_get('field_info_types', 'cache_bootstrap')) {
       $info = $cached->data;
     }
     else {
@@ -137,7 +137,7 @@ function _field_info_collate_types($rese
       }
       drupal_alter('field_storage_info', $info['storage types']);
 
-      cache_set('field_info_types', $info, 'cache_field');
+      cache_set('field_info_types', $info, 'cache_bootstrap');
     }
   }
 
@@ -168,12 +168,12 @@ function _field_info_collate_fields($res
 
   if ($reset) {
     $info = NULL;
-    cache_clear_all('field_info_fields', 'cache_field');
+    cache_clear_all('field_info_fields', 'cache_bootstrap');
     return;
   }
 
   if (!isset($info)) {
-    if ($cached = cache_get('field_info_fields', 'cache_field')) {
+    if ($cached = cache_get('field_info_fields', 'cache_bootstrap')) {
       $definitions = $cached->data;
     }
     else {
@@ -181,7 +181,7 @@ function _field_info_collate_fields($res
         'field_ids' => field_read_fields(array(), array('include_deleted' => 1)),
         'instances' => field_read_instances(),
       );
-      cache_set('field_info_fields', $definitions, 'cache_field');
+      cache_set('field_info_fields', $definitions, 'cache_bootstrap');
     }
 
     // Populate 'field_ids' with all fields.
Index: modules/rdf/rdf.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/rdf/rdf.module,v
retrieving revision 1.8
diff -u -p -r1.8 rdf.module
--- modules/rdf/rdf.module	12 Nov 2009 07:00:48 -0000	1.8
+++ modules/rdf/rdf.module	13 Nov 2009 13:58:24 -0000
@@ -163,7 +163,7 @@ function rdf_mapping_save(&$mapping) {
     ))
     ->execute();
 
-  cache_clear_all('entity_info', 'cache');
+  cache_clear_all('entity_info', 'cache_bootstrap');
   drupal_static_reset('entity_get_info');
 
   return $status;
Index: modules/rdf/rdf.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/rdf/rdf.test,v
retrieving revision 1.3
diff -u -p -r1.3 rdf.test
--- modules/rdf/rdf.test	20 Oct 2009 19:54:15 -0000	1.3
+++ modules/rdf/rdf.test	13 Nov 2009 13:58:24 -0000
@@ -138,7 +138,7 @@ class RdfMappingDefinitionTestCase exten
     rdf_modules_installed(array('rdf_test', 'node'));
     // entity_info caches must be cleared during testing. This is done
     // automatically during the manual installation.
-    cache_clear_all('entity_info', 'cache');
+    cache_clear_all('entity_info', 'cache_bootstrap');
     drupal_static_reset('entity_get_info');
   }
 
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.38
diff -u -p -r1.38 field_test.module
--- modules/simpletest/tests/field_test.module	2 Nov 2009 03:41:58 -0000	1.38
+++ modules/simpletest/tests/field_test.module	13 Nov 2009 13:58:24 -0000
@@ -701,7 +701,7 @@ function field_test_entity_info_translat
   if (isset($obj_type)) {
     $stored_value[$obj_type] = $translatable;
     drupal_static_reset('entity_get_info');
-    cache_clear_all('entity_info', 'cache');
+    cache_clear_all('entity_info', 'cache_bootstrap');
   }
   return $stored_value;
 }
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.221
diff -u -p -r1.221 system.admin.inc
--- modules/system/system.admin.inc	11 Nov 2009 17:14:59 -0000	1.221
+++ modules/system/system.admin.inc	13 Nov 2009 13:58:25 -0000
@@ -1031,7 +1031,7 @@ function system_modules_submit($form, &$
   node_types_rebuild();
   menu_rebuild();
   cache_clear_all('schema', 'cache');
-  cache_clear_all('entity_info', 'cache');
+  cache_clear_all('entity_info', 'cache_bootstrap');
   drupal_clear_css_cache();
   drupal_clear_js_cache();