Combinate the files to be separated classes.
Merge branch 'master' of https://github.com/prowindy/NewCacheMatters