Fix #2579: Query Builder's "no escape" functionality didn't work properly with query cache