Wip 10194 master

A more intrusive fix to 10194. This will reuse connection structure between requests.