diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 39712fb08dd..f1610e8b3a4 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -396,7 +396,7 @@
         assert res_8 == [1]
         assert res_9 == []
 
-        # get the companies referenced by some currency (this is normally the main company)
+        # get the companies referenced by some currency (this is normally the main company) using a weird negative domain
         res_10 = self.search(cr, uid, [('currency_ids', 'not like', 'probably_unexisting_name')])
         res_11 = self.search(cr, uid, [('currency_ids', 'not in', [max_currency_id + 1])])
         res_12 = self.search(cr, uid, [('currency_ids', '!=', False)])
@@ -408,6 +408,20 @@
         assert res_10 == res_11
         assert res_10 == res_12
         assert res_10 == res_13
+        
+        # try testing real subsets with IN/NOT IN
+        res_partner = self.pool.get('res.partner')
+        res_users = self.pool.get('res.users')
+        p1, _ = res_partner.name_create(cr, uid, "Dédé Boitaclou")
+        p2, _ = res_partner.name_create(cr, uid, "Raoulette Pizza O'poil")
+        u1a = res_users.create(cr, uid, {'login': 'dbo', 'partner_id': p1})
+        u1b = res_users.create(cr, uid, {'login': 'dbo2', 'partner_id': p1})
+        u2 = res_users.create(cr, uid, {'login': 'rpo', 'partner_id': p2})
+        assert [p1] == res_partner.search(cr, uid, [('user_ids', 'in', u1a)]), "o2m IN accept single int on right side"
+        assert [p1,p2] == res_partner.search(cr, uid, [('user_ids', 'in', [u1a,u2])]), "o2m IN matches any on the right side"
+        all_partners = res_partner.search(cr, uid, [])
+        assert (set(all_partners) - set([p1])) == set(res_partner.search(cr, uid, [('user_ids', 'not in', u1a)])), "o2m NOT IN matches none on the right side"
+        assert (set(all_partners) - set([p1,p2])) == set(res_partner.search(cr, uid, [('user_ids', 'not in', [u1b, u2])])), "o2m NOT IN matches none on the right side"
 
         # child_of x returns x and its children (direct or not).
         company = self.browse(cr, uid, ref('ymltest_company3'))
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 5f2c0b915c1..2b2d33a496e 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -540,7 +540,8 @@ class expression(object):
                             ids2 = select_from_where(cr, field._fields_id, field_obj._table, 'id', ids2, operator)
                             if ids2:
                                 call_null = False
-                                self.__exp[i] = ('id', 'in', ids2)
+                                o2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
+                                self.__exp[i] = ('id', o2m_op, ids2)
 
                     if call_null:
                         o2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
diff --git a/openerp/tools/cache.py b/openerp/tools/cache.py
index 2c5c4a46e0d..6e18007c340 100644
--- a/openerp/tools/cache.py
+++ b/openerp/tools/cache.py
@@ -43,7 +43,7 @@ class ormcache(object):
            return r
         except KeyError:
            self.stat_miss += 1
-           value = d[args] = self.method(self2, cr, *args)
+           value = d[key] = self.method(self2, cr, *args)
            return value
         except TypeError:
            self.stat_err += 1
diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index 601fd95200a..1c3870004a7 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -46,7 +46,7 @@ _ALLOWED_MODULES = ['_strptime', 'time']
 _CONST_OPCODES = set(opmap[x] for x in [
     'POP_TOP', 'ROT_TWO', 'ROT_THREE', 'ROT_FOUR', 'DUP_TOP', 'DUP_TOPX',
     'POP_BLOCK','SETUP_LOOP', 'BUILD_LIST', 'BUILD_MAP', 'BUILD_TUPLE',
-    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR'] if x in opmap)
+    'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR', 'STORE_MAP'] if x in opmap)
 
 _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
     'UNARY_POSITIVE', 'UNARY_NEGATIVE', 'UNARY_NOT',
@@ -61,7 +61,7 @@ _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
     ] if x in opmap))
 
 _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
-    'STORE_MAP', 'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
+    'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
     'STORE_NAME', 'GET_ITER', 'FOR_ITER', 'LIST_APPEND', 'DELETE_NAME',
     'JUMP_FORWARD', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE', 'JUMP_ABSOLUTE',
     'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3',