diff --git a/flag.module b/flag.module
index 7389d2e..e6e7ad1 100644
--- a/flag.module
+++ b/flag.module
@@ -1683,17 +1683,15 @@ function flag_get_flag($name = NULL, $fid = NULL) {
  * @param $account
  *   Optional. The user accont to filter available flags. If not set, all
  *   flags for will this node will be returned.
- * @param $reset
- *   Optional. Reset the internal query cache.
  *
  * @return $flags
  *   An array of the structure [fid] = flag_object.
  */
-function flag_get_flags($entity_type = NULL, $content_subtype = NULL, $account = NULL, $reset = FALSE) {
+function flag_get_flags($entity_type = NULL, $content_subtype = NULL, $account = NULL) {
   $flags = &drupal_static(__FUNCTION__);
 
   // Retrieve a list of all flags, regardless of the parameters.
-  if (!isset($flags) || $reset) {
+  if (!isset($flags)) {
     $flags = array();
 
     // Database flags.
diff --git a/includes/flag.admin.inc b/includes/flag.admin.inc
index 11ebaac..6468363 100644
--- a/includes/flag.admin.inc
+++ b/includes/flag.admin.inc
@@ -643,7 +643,7 @@ function _flag_clear_cache() {
   }
   // Reset our flags cache, thereby making the following code aware of the
   // modifications.
-  flag_get_flags(NULL, NULL, NULL, TRUE);
+  drupal_static_reset('flag_get_flags');
   // The title of a flag may appear in the menu (indirectly, via our "default
   // views"), so we need to clear the menu cache. This call also clears the
   // page cache, which is desirable too because the flag labels may have
diff --git a/includes/flag/flag_flag.inc b/includes/flag/flag_flag.inc
index b763d7d..f6a3877 100644
--- a/includes/flag/flag_flag.inc
+++ b/includes/flag/flag_flag.inc
@@ -1270,7 +1270,7 @@ class flag_flag {
         $default_flag = clone $default_flag;
         $default_flag->fid = $this->fid;
         $default_flag->save();
-        flag_get_flags(NULL, NULL, NULL, TRUE);
+        drupal_static_reset('flag_get_flags');
         return TRUE;
       }
       else {
diff --git a/tests/flag.test b/tests/flag.test
index 8803507..28ea480 100644
--- a/tests/flag.test
+++ b/tests/flag.test
@@ -60,7 +60,7 @@ class FlagTestCase extends DrupalWebTestCase {
 
     $this->drupalPost(FLAG_ADMIN_PATH . '/add/node', $edit, t('Save flag'));
 
-    flag_get_flags(NULL, NULL, NULL, TRUE);
+    drupal_static_reset('flag_get_flags');
     $flag = flag_get_flag($edit['name']);
 
     // Check that the flag object is in the database.
@@ -97,7 +97,7 @@ class FlagTestCase extends DrupalWebTestCase {
 
     $this->drupalPost(FLAG_ADMIN_PATH . '/manage/' . $flag->name, $edit, t('Save flag'));
 
-    flag_get_flags(NULL, NULL, NULL, TRUE);
+    drupal_static_reset('flag_get_flags');
     $flag = flag_get_flag($edit['name']);
 
     // Check that the flag object is in the database.
@@ -110,7 +110,7 @@ class FlagTestCase extends DrupalWebTestCase {
 
     // Delete the flag through the UI.
     $this->drupalPost(FLAG_ADMIN_PATH . '/manage/' . $flag->name . '/delete', array(), t('Delete'));
-    flag_get_flags(NULL, NULL, NULL, TRUE);
+    drupal_static_reset('flag_get_flags');
     $this->assertFalse(flag_get_flag($flag->name), t('Flag successfully deleted.'));
   }