Don't cache toolbars twice. Fix flickering.

There was a flicker problem with the tool bars because of
missing information in the cache key. We added this info
and removed the redundant caching of toolbar gradients.

Done-with: thorbjorn