ERT-734 - ErtTestContext cache fix
Merge remote-tracking branch 'origin/ERT-734' into ERT-734