It might be worthwhile handling/caching the ```unit is None``` case too.