Removes useless and broken caching logic