Fix some test failures due to turbocaching