Commenting out caching attempts for now