Add caching
Coverage update