Re-add caching.