[WIP] Longer lived adapters

Closes #151