another possibility is to pass the generated HQLQueryPlan out of the first method to the second one without changing QueryImpl. It should be pretty easy to do that for everything is happening in one class. Changing QueryImpl has some global compatibility concern, though.