Added folder name option and Cache management functionality