Revert r45642 "* Fixing the caching issue by using -{T|xxx}- syntax (only applies...