remove cached query (seems like not much use), add a better debug dumper