FileCache improvements and fixes