I guess I would suggest adding a method that is something like loadAndUpgradeCatalog that could be called from locations where we want to support recompilation, and then we could cut over the calling sites one-by-one, and then eventually get rid of the non-upgrade method.