Backport LazyAsync changes from UK Trains