Code cleanup
Disabled caching for notification tests.