diff --git a/mysql-test/suite/roles/set_and_drop.result b/mysql-test/suite/roles/set_and_drop.result
index 453e582af34..1814c19cc97 100644
--- a/mysql-test/suite/roles/set_and_drop.result
+++ b/mysql-test/suite/roles/set_and_drop.result
@@ -95,6 +95,8 @@ pr1
 pr1
 drop role role1;
 flush tables;
+select * from mysql.roles_mapping;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
 select * from mysqltest1.t1;
 ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
 select a from mysqltest1.t2;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 73256573fcd..28c45aa4c33 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -8882,6 +8882,7 @@ static int handle_grant_data(TABLE_LIST *tables, bool drop,
       /* If search is requested, we do not need to search further. */
       if (search_only)
         goto end;
+      acl_cache->clear(1);
     }
   }