Fix race with in-memory store
Fix race with in-memory store

josephyzhou/mandible,Imgur/mandible,briankassouf/mandible,Klaasvaak/mandible,Imgur/mandible,briankassouf/mandible,josephyzhou/mandible,Klaasvaak/mandible,henrylee2cn/mandible,henrylee2cn/mandible