Less magical adapters.
Minor code clean up.
Restore connection caching/thread.
update adapter unit tests.
Fix reconnect issues.
Better naming.