Fix typo.
Work on auto-restart of daemon queue workers.
Use cache repository.
Fix conflicts. Merge.