this should prevent cache related problems when dealing with full or near-full disks
BUG: 466415 BUG: 467135
(cherry picked from commit 8f600380)