Stylecop cleanup and caching