Fixing old flapper (concurrent changes to cache are unsafe)
Merge pull request #240 from wmathurin/unstable

Fixing old flapper (concurrent changes to cache are unsafe)