added a few more missing items to file cache entry accounting.  fixed compile bug on OSX.  corrected cache2_test for new accounting.