Fix cache unit tests
Merge pull request #1188 from ogail/ut

Fix cache unit tests