clean-up for issue 1592 #4144

Job	Run time
build	3m 19s
test_when_cache_missing	0s
test_when_cache_present (0, 9, 590)	25m 1s
test_when_cache_present (1, 9, 590)	21m 28s
test_when_cache_present (2, 9, 590)	22m 19s
test_when_cache_present (3, 9, 590)	20m 12s
test_when_cache_present (4, 9, 590)	20m 11s
test_when_cache_present (5, 9, 590)	23m 9s
test_when_cache_present (6, 9, 590)	23m 23s
test_when_cache_present (7, 9, 590)	23m 59s
test_when_cache_present (8, 9, 590)	24m 49s
test_when_cache_present (9, 9, 590)	10m 37s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	8s
	3h 38m 35s

Provide feedback