Remove redundant comments
Pull cache creation out of begin block