* Pop instead of get * Better error handling for unit registry * Prevent caching during database migrations * Remove debug msg * Revert changes