CLC-1387 Make notification controller cacheable; DRY up cache writes
Merge pull request #745 from ctweney/clc-1387

CLC-1387 Make notification controller cacheable; DRY up cache writes