From 4aa08fe35367a23c7c604b14e8c2ae8205b232ac Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefanv@berkeley.edu>
Date: Sat, 12 Dec 2015 19:23:43 -0800
Subject: [PATCH] Simplify cache

---
 skimage/measure/_regionprops.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py
index cada4068..de523592 100644
--- a/skimage/measure/_regionprops.py
+++ b/skimage/measure/_regionprops.py
@@ -65,7 +65,7 @@ def _cached(f):
         cache = obj._cache
         prop = f.__name__
 
-        if (cache[prop] is None) or (not obj._cache_active):
+        if not ((prop in cache) and obj._cache_active):
             cache[prop] = f(obj)
 
         return cache[prop]
@@ -87,7 +87,7 @@ class _RegionProperties(object):
         self._intensity_image = intensity_image
 
         self._cache_active = cache_active
-        self._cache = defaultdict(lambda: None)
+        self._cache = {}
 
     def area(self):
         return self.moments[0, 0]