Add folder cache/ checking;