Hopefully this will take care of the badge caching problem