Add ability to use watch / debug / cache options