diff --git a/fstab.goldfish b/fstab.goldfish
index be83a16..8617307 100644
--- a/fstab.goldfish
+++ b/fstab.goldfish
@@ -4,6 +4,5 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 /dev/block/mtdblock0                                    /system             ext4      ro,barrier=1                                         wait
 /dev/block/mtdblock1                                    /data               ext4      noatime,nosuid,nodev,barrier=1,nomblk_io_submit      wait,check
-# 2014-03-13: Yes. yaffs2. The emulator tools need some updating to support ext4 for the cache image.
-/dev/block/mtdblock2                                    /cache              yaffs2      noatime,nosuid,nodev  wait,check
+/dev/block/mtdblock2                                    /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check
 /devices/platform/goldfish_mmc.0                        auto                vfat      defaults                                             voldmanaged=sdcard:auto