Fix too aggressive caching.
Fix tagging that did not work?