Fix forgotten import
Do not attempt to update an empty cache
Handle bulk save exception
Minor edit
Merge branch 'hotfix/0.14.2'