TODOs
Merge branch 'dev-dot+cachedir'
switched staticDir to cacheDir
Merge branch 'dev-dot+cachedir'