remove dependency on node.extend & improve cache

Changesets for this Pull Request have not been imported, because it had been already declined on Bitbucket. Marked as closed by the import user.