Extract template content in the wrapper

Fixes a TODO in the code. Now, there should be no way to be able to see the non extracted content.