Adding cache structure and wysiwyg stuff