Caching refined
Extracted common rendering code
Merge branch 'master' of github.com:wconsumer/wsprofile