CLC-1387 Cache notifications again, the right way this time
Merge pull request #779 from ctweney/clc-1387-again

CLC-1387 Cache notifications again, the right way this time