Switch to Save event because it fires for pages set to publish in the future
Add bug fix to ensure cache is updated with only currently-published content