Slight cache path optimization
Fix issue w/ users unpublishing themselves