FileCache
Bugfix for #0014659 and #0014658