Not sure when I merged caching in; not done; removing
Add back the delegation
Adds more attributes to search results