Revert r101488, breaks parser test. Add a comment explaining why there is no caching...