Ability to flush file-based cache storage
Merge branch 'flush_file_cache' into master-with-fixes