Jon Bake it seems very fragile and I don't think it will work, especially once we integrate https://github.com/hibernate/hibernate-orm/pull/2465 .

We will need to pass the additional information to the LimitHandler. Hopefully, it's available somewhere and we can pass it (this needs to be checked).

We would need a default method defaulting to the current one to ensure compatibility.

Could you create a JIRA issue so we can track it?

We will release 5.4.0 in a couple of weeks, it could be a great addition if you think you can work on it.