Fixes tag cache test issues introduced in c6c4d5a8
Merge pull request #2519 from halfdan/tag-cache

Fixes tag cache test issues introduced in c6c4d5a8