Improved JSON auto import / export to use new format

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Minor cache fixes

Signed-off-by: Elliot Condon <e@elliotcondon.com>