I have a branch using the proxy approach we discussed, but fails because of refactoring in ORM's Query interface (it was added a parent interface which highly complicates things).
I have an email with more details in my draft folder, will resume that after this release.