will create a separate PR for removing caching for selectQuery.