Global unit cache
Merge pull request #635 from rhattersley/unit-cache

Global unit cache