diff --git a/includes/form.inc b/includes/form.inc
index 442016a..0263bb5 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -835,8 +835,8 @@ function drupal_process_form($form_id, &$form, &$form_state) {
       // here, as we've finished with them. The in-memory copies are still
       // here, though.
       if (!variable_get('cache', 0) && !empty($form_state['values']['form_build_id'])) {
-        cache_clear_all('form_' . $form_state['values']['form_build_id'], 'cache_form');
-        cache_clear_all('form_state_' . $form_state['values']['form_build_id'], 'cache_form');
+        cache('form_' . $form_state['values']['form_build_id'])->delete('cache_form');
+        cache('form_state_' . $form_state['values']['form_build_id'])->delete('cache_form');
       }
 
       // If batches were set in the submit handlers, we process them now,
diff --git a/includes/gettext.inc b/includes/gettext.inc
index 39a6fbe..ada8930 100644
--- a/includes/gettext.inc
+++ b/includes/gettext.inc
@@ -53,7 +53,7 @@ function _locale_import_po($file, $langcode, $mode) {
 
   // Clear cache and force refresh of JavaScript translations.
   _locale_invalidate_js($langcode);
-  cache_clear_all('locale:', 'cache', TRUE);
+  cache('locale:')->delete('cache');
 
   // Rebuild the menu, strings may have changed.
   menu_rebuild();
diff --git a/includes/menu.inc b/includes/menu.inc
index 3e775db..bb95217 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2512,7 +2512,7 @@ function menu_cache_clear($menu_name = 'navigation') {
   $cache_cleared = &drupal_static(__FUNCTION__, array());
 
   if (empty($cache_cleared[$menu_name])) {
-    cache_clear_all('links:' . $menu_name . ':', 'cache_menu', TRUE);
+    cache('links:' . $menu_name . ':')->delete('cache_menu');
     $cache_cleared[$menu_name] = 1;
   }
   elseif ($cache_cleared[$menu_name] == 1) {
@@ -3155,7 +3155,7 @@ function _menu_clear_page_cache() {
   // Clear the page and block caches, but at most twice, including at
   //  the end of the page load when there are multiple links saved or deleted.
   if ($cache_cleared == 0) {
-    cache_clear_all();
+    cache()->flush();
     // Keep track of which menus have expanded items.
     _menu_set_expanded_menus();
     $cache_cleared = 1;
diff --git a/includes/module.inc b/includes/module.inc
index 66c77f5..b2cf2bd 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -197,8 +197,7 @@ function system_list_reset() {
   drupal_static_reset('system_list');
   drupal_static_reset('system_rebuild_module_data');
   drupal_static_reset('list_themes');
-  cache_clear_all('bootstrap_modules', 'cache_bootstrap');
-  cache_clear_all('system_list', 'cache_bootstrap');
+  cache()->deleteMultiple(array('bootstrap_modules', 'system_list', 'cache_bootstrap'));
 }
 
 /**
@@ -651,7 +650,7 @@ function module_implements($hook, $sort = FALSE, $reset = FALSE) {
     cache_set('module_implements', array(), 'cache_bootstrap');
     drupal_static_reset('module_hook_info');
     drupal_static_reset('drupal_alter');
-    cache_clear_all('hook_info', 'cache_bootstrap');
+    cache()->deleteMultiple(array('hook_info', 'cache_bootstrap'));
     return;
   }
 
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 2737c2b..6828a7f 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -770,7 +770,7 @@ function poll_vote($form, &$form_state) {
     ->condition('chid', $choice)
     ->execute();
 
-  cache_clear_all();
+  cache()->flush();
 
   if (!$user->uid) {
     // The vote is recorded so the user gets the result view instead of the