ESDEV-438. Static Cache. Fixes for tests with static cache.