Closes #324

Investigate if we should support cancellation tokens