Issue 4092 cache flushing too aggressive