Remove duplicate params
Create ensure we create the cache directory
Merge branch 'fixups'