Fix Issues #16 - Remove FS cache to prevent memory leaks

Closes #16