Change fileCache a bit, and remove the 2nd construct