Adding the caching back in.