Fixed path to cache dir + workaround for a Closure Compiler bug
Synced from master
Synced from master