Improve robustness of cache integration test (#1557)

Improve robustness of cache integration test (#1557) #45