Put caching back in so that it seems to work.