Added --no-cache option and made some changes