Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1090
diff -u -r1.1090 common.inc
--- includes/common.inc	14 Jan 2010 18:45:17 -0000	1.1090
+++ includes/common.inc	15 Jan 2010 09:17:05 -0000
@@ -6389,7 +6389,7 @@
   $entity_info = &$drupal_static_fast['entity_info'];
 
   if (empty($entity_info)) {
-    if ($cache = cache_get('entity_info')) {
+    if ($cache = cache_get('entity_info', 'cache_bootstrap')) {
       $entity_info = $cache->data;
     }
     else {
@@ -6419,7 +6419,7 @@
       }
       // 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');
     }
   }
 
@@ -6431,7 +6431,7 @@
  */
 function entity_info_cache_clear() {
   drupal_static_reset('entity_get_info');
-  cache_clear_all('entity_info', 'cache');
+  cache_clear_all('entity_info', 'cache_bootstrap');
 }
 
 /**
Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.37
diff -u -r1.37 field.info.inc
--- modules/field/field.info.inc	13 Jan 2010 04:37:03 -0000	1.37
+++ modules/field/field.info.inc	15 Jan 2010 09:17:05 -0000
@@ -71,12 +71,12 @@
 
   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 {
@@ -144,7 +144,7 @@
       }
       drupal_alter('field_storage_info', $info['storage types']);
 
-      cache_set('field_info_types', $info, 'cache_field');
+      cache_set('field_info_types', $info, 'cache_bootstrap');
     }
   }
 
@@ -176,12 +176,12 @@
 
   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 {
@@ -189,7 +189,7 @@
         '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.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/rdf/rdf.test,v
retrieving revision 1.7
diff -u -r1.7 rdf.test
--- modules/rdf/rdf.test	14 Jan 2010 06:31:45 -0000	1.7
+++ modules/rdf/rdf.test	15 Jan 2010 09:17:05 -0000
@@ -263,8 +263,7 @@
     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');
-    drupal_static_reset('entity_get_info');
+    entity_info_cache_clear();
     // Enable anonymous posting of content.
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'create article content' => TRUE,