How will the eventual solution not break APIs though? Fixing it later is fine, but it's better to keep the API stable in between now and fixing the issue. Making the model registration static would seem to be the issue.