Caching almost done. Still needs invalidation.