diff --git a/trytond/cache.py b/trytond/cache.py
index f6ee02b099..7518af3883 100644
--- a/trytond/cache.py
+++ b/trytond/cache.py
@@ -250,7 +250,7 @@ class MemoryCache(BaseCache):
     @classmethod
     def commit(cls, transaction):
         table = Table(cls._table)
-        reset = cls._reset.setdefault(transaction, set())
+        reset = cls._reset.pop(transaction, None)
         if not reset:
             return
         database = transaction.database
@@ -303,10 +303,7 @@ class MemoryCache(BaseCache):
 
     @classmethod
     def rollback(cls, transaction):
-        try:
-            cls._reset[transaction].clear()
-        except KeyError:
-            pass
+        cls._reset.pop(transaction, None)
 
     @classmethod
     def drop(cls, dbname):