Store them under a key with the name of the query (or ideally, hash of the query text), rather than a key of the table name. Perhaps the issue is that we don't have a good way to access the query name in the

::genTable

context?