Improved folders detect in cache module. Updated submodules