Further improved test stability, especially during first execution after
server restart when caches are empty