Added skip_cache setting and some associated tests