Removed first incomplete efforts to make the caching work