Added fix for registration caching