We're trying hard to not need to add additional configuration properties, but rather embrace principles of ergonomics.

So we've fixed the issue by ensuring that the actual number of entity classes doesn't count towards the limit; that will avoid to suddenly hit this obscure limit with large applications, but will still penalize applications which generate an unreasonable number of pseudo-random meaningless tokens.

I think that's a reasonble solution in scope of a relatively urgent bugfix; we can also revisit this to improve the overall pattern further - I've included a couple of possible suggestions in the comment code but we'll only explore such directions if there's further evidence of this being needed. Also I'd prefer to explore such directions in the context of an enhancement rather than a regression bugfix.