small fix
Cache fix + install module fix
Merge remote-tracking branch 'yupe/master'