Change named of function that caches unit to official cached_unit()