Fix orphaning not expiring caches
Merge pull request #1819 from elzj/queue_changes

Issue 4078: Fix orphaning not expiring caches