Fix scenario tests
Merge pull request #1439 from ogail/cache

Fix scenario tests