Right this should be an option, and I think it should be an explicit opt-in.

I'm torn about which one should be the default.
I think the default should be the current behaviour, as it is the only one guaranteeing correctness and at worst brings the matter to the user's attention rather than introducing subtle issues with the results.

On the other hand, we could avoid some trouble by simply logging a WARN every time we need to re-incarnate a query automatically, that might avoid some exceptions to people (would they only find out in production?) and probably still get some attention.