Expire all tag types correctly
More consistency for tag-related cache keys
Merge pull request #1828 from elzj/queue_changes

Issue 4078: Tag cache key consistency