Added --no-cache support