Adjust eager loading and cache dom calculations to improve speed