WIKI-626 Remove dependencies to Cache macro, Content macro and Comment macro