Issue #1404 Fix of write cache test issues.