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 02:26:21 -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.26
diff -u -p -r1.26 field.info.inc
--- modules/field/field.info.inc	31 Oct 2009 16:06:35 -0000	1.26
+++ modules/field/field.info.inc	13 Nov 2009 02:26:23 -0000
@@ -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_field_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.