Fix the analog tests where saveSettings is no longer called by set analog source.
Cache the results of the canonicalisation call using a weak table.