Async mock, cleanup

Next up is handling concurrency via versioning.