Added stats caching