diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 4046cbd7bfd..1a5fca33408 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -372,7 +372,7 @@ function variable_init($conf = array()) {
     while ($variable = db_fetch_object($result)) {
       $variables[$variable->name] = unserialize($variable->value);
     }
-    cache_set('variables', 'cache', serialize($variables));
+    cache_set('variables', serialize($variables));
   }
 
   foreach ($conf as $name => $value) {
diff --git a/includes/cache.inc b/includes/cache.inc
index 371d01bdba3..2f656541d88 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -74,11 +74,11 @@ function cache_get($key, $table = 'cache') {
  *
  * @param $cid
  *   The cache ID of the data to store.
+ * @param $data
+ *   The data to store in the cache. Complex data types must be serialized first.
  * @param $table
  *   The table $table to store the data in. Valid core values are 'cache_filter',
  *   'cache_menu', 'cache_page', or 'cache'.
- * @param $data
- *   The data to store in the cache. Complex data types must be serialized first.
  * @param $expire
  *   One of the following values:
  *   - CACHE_PERMANENT: Indicates that the item should never be removed unless
@@ -90,7 +90,7 @@ function cache_get($key, $table = 'cache') {
  * @param $headers
  *   A string containing HTTP header information for cached pages.
  */
-function cache_set($cid, $table = 'cache', $data, $expire = CACHE_PERMANENT, $headers = NULL) {
+function cache_set($cid, $data, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
   db_lock_table($table);
   db_query("UPDATE {%s} SET data = %b, created = %d, expire = %d, headers = '%s' WHERE cid = '%s'", $table, $data, time(), $expire, $headers, $cid);
   if (!db_affected_rows()) {
diff --git a/includes/common.inc b/includes/common.inc
index 1ab8a019577..ebbb75c146e 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1926,7 +1926,7 @@ function page_set_cache() {
       }
       ob_end_flush();
       if ($cache && $data) {
-        cache_set($base_root . request_uri(), 'cache_page', $data, CACHE_TEMPORARY, drupal_get_headers());
+        cache_set($base_root . request_uri(), $data, 'cache_page', CACHE_TEMPORARY, drupal_get_headers());
       }
     }
   }
diff --git a/includes/theme.inc b/includes/theme.inc
index 4d02c0ecc87..8db547614af 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -128,7 +128,7 @@ function _theme_load_registry($theme, $theme_engine = NULL) {
  * Write the theme_registry cache into the database.
  */
 function _theme_save_registry($theme, $registry) {
-  cache_set("theme_registry:$theme", 'cache', serialize($registry));
+  cache_set("theme_registry:$theme", serialize($registry));
 }
 
 /**
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 337ecfaee56..b3303fc3681 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -777,7 +777,7 @@ function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
 
     // Store in cache with a minimum expiration time of 1 day.
     if ($cache) {
-      cache_set($id, 'cache_filter', $text, time() + (60 * 60 * 24));
+      cache_set($id, $text, 'cache_filter', time() + (60 * 60 * 24));
     }
   }
   else {
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 3eecc4562db..a3d0438d341 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -268,7 +268,7 @@ function locale_refresh_cache() {
     while ($data = db_fetch_object($result)) {
       $t[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
     }
-    cache_set('locale:'. $language->language, 'cache', serialize($t));
+    cache_set('locale:'. $language->language, serialize($t));
   }
 }