TODO: Fix Async tasks not being canceled