Longer lived JSON adapters

Closes #151, #148