Forgot to add caching back in