.WithCache adjusted (onCompleted moved to its place