Fixed template cache links

Removed failing test for tooltip

@stulees second part of the template cache changes. Please review. Thanks.