Fix overwriting filename on restore

Closes #27

- Use _.merge instead of _.extend to prevent overwriting filename
- Omit file details when restoring from cache
Merge pull request #28 from jgable/fix27

Fix overwriting filename on restore