Fix Filesystem prepend when file doesn't exist
Work around errors in cache stuff.
Merge branch '4.0'