Moved to async store to emulate move to fs