Update PageCache and Service so that we can use [ContextAware] with both Rock core entities and also Plugin entities