Done - attempts at better performance with eager loading and page caching