Better tooltips, re-enabled caching