Closes #341

Investigate if/when we need to call .ConfigureAwait(false)