Fixing bug in Memory store, and making sure InMemoryStore is a singleton!