Adding caching and filesystem support