Add `shouldRefresh` flag #2165

Job	Run time
test-unit-portalnetwork (20)	1m 36s
test-unit-portalnetwork (20)	1m 36s
test-integration-portalnetwork (20)	1m 30s
test-integration-portalnetwork (20)	1m 44s
	6m 26s

Provide feedback