Added CachedSongDeleted notification name
Minor refactoring to support iSub refactoring changes