Fix test.
Merge branch 'master' into cache_hybrid_strategy