Handle larger set of dependencies in the file system cache

Fixes #4