Some build dependency tweaks.
Merge branch 'master' into cache