Added better cache to handle changing files
Correct indent
Merge branch 'bettercache'