i think we may want to drop a marker here and do the actual invalidation _after_ the query has executed