Cleanup and simplification for FilecacheClient