FilesystemCache refactoring.