added support for cacheable take/drop queries