The implementation in #28 is the better lazy loading too.  I think this pull request could be closed.