Replaced cleanup tag with finish tag, added nocache disable feature