3 clean builds in a row!

Fixes MC-236 (at least I think it does). I've triggered 3 consecutive clean builds now so I think we've got most of the async code tested properly in Geb.

@SoheilSaif could you review and merge this for me please? :)