MDL-39526 cache: cleaned up disable_stores calls