Added some extra defensive code around dereferencing the registration.
Restored BrowserFileCache