Switched back to using JSONStorage