As far as I can tell, caching all stats now works ;).  Need to do some
more checks and then merge with master. #216