also cache when we have a version_info
make query tests more flexible