Added Cache Folder, commented out 'funs'