Fix some caching issues and speed issues with instant stats