diff --git a/classes/GravProxy.php b/classes/GravProxy.php
new file mode 100644
index 0000000..9629dab
--- /dev/null
+++ b/classes/GravProxy.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * This file is part of Grav Shortcodes plugin.
+ *
+ * Dual licensed under the MIT or GPL Version 3 licenses, see LICENSE.
+ * http://benjamin-regler.de/license/
+ */
+
+namespace Grav\Plugin\Shortcodes;
+
+use Grav\Common\Grav;
+use Grav\Common\Page\Page;
+use RocketTheme\Toolbox\Event\Event;
+
+class GravProxy implements \ArrayAccess
+{
+  protected $object;
+  protected $page;
+  protected $name = [];
+  protected $callable;
+
+  /**
+   * Constructor.
+   *
+   * @param object   $object [description]
+   * @param Page   $page [description]
+   * @param [type] $name  [description]
+   */
+  public function __construct($object, $page, $callable = null, $name = null)
+  {
+    $this->object = $object;
+    $this->page = $page;
+    $this->callable = $callable;
+
+    if ($name) {
+      $this->name = is_array($name) ? $name : [$name];
+    }
+
+    if ($callable && !is_callable($callable)) {
+      throw new \Exception(sprintf("Function '%s' must be callable.", $callable));
+    }
+  }
+
+  public function __call($method, array $arguments = [])
+  {
+    if ($callable = $this->callable) {
+      $result = $callable([// new Event([
+        'type' => '__call',
+        'object' => $this->object,
+        'page' => $this->page,
+        'name' => implode('.', $this->name),
+        'arguments' => [$method, $arguments]
+      ]);
+    }
+
+    return is_null($result) ? call_user_func_array([$this->object, $method], $arguments) : $result;
+  }
+
+  /**
+   * ArrayAccess implementation
+   */
+
+  /**
+   * Whether or not an offset exists.
+   *
+   * @param mixed $offset  An offset to check for.
+   * @return bool          Returns TRUE on success or FALSE on failure.
+   */
+  public function offsetExists($offset)
+  {
+    if ($callable = $this->callable) {
+      $result = $callable([ //new Event([
+        'type' => 'offsetExists',
+        'object' => $this->object,
+        'page' => $this->page,
+        'name' => implode('.', $this->name),
+        'arguments' => [$offset]
+      ]);
+    }
+
+    return is_null($result) ? isset($this->object[$offset]) : $result;
+  }
+
+  /**
+   * Returns the value at specified offset.
+   *
+   * @param mixed $offset  The offset to retrieve.
+   * @return mixed         Can return all value types.
+   */
+  public function offsetGet($offset)
+  {
+    if (isset($this->object[$offset])) {
+      if ($callable = $this->callable) {
+        $result = $callable([ // new Event([
+          'type' => 'offsetGet',
+          'object' => $this->object,
+          'page' => $this->page,
+          'name' => implode('.', $this->name),
+          'arguments' => [$offset]
+        ]);
+      }
+
+      if (is_null($result)) {
+        $name = array_merge($this->name, [$offset]);
+        $result = new static($this->object[$offset], $this->page, $this->callable, $name);
+      }
+
+      return $result;
+    }
+  }
+
+  /**
+   * Assigns a value to the specified offset.
+   *
+   * @param mixed $offset  The offset to assign the value to.
+   * @param mixed $value   The value to set.
+   */
+  public function offsetSet($offset, $value)
+  {
+    if ($callable = $this->callable) {
+      $result = $callable([ //new Event([
+        'type' => 'offsetSet',
+        'object' => $object,
+        'page' => $this->page,
+        'name' => implode('.', $this->name),
+        'arguments' => [$offset]
+      ]);
+    }
+
+    if (is_null($result)) {
+      if (is_null($offset)) {
+        $this->object[] = $value;
+      } else {
+        $this->object[$offset] = $value;
+      }
+    }
+  }
+
+  /**
+   * Unsets an offset.
+   *
+   * @param mixed $offset  The offset to unset.
+   */
+  public function offsetUnset($offset)
+  {
+    if ($callable = $this->callable) {
+      $result = $callable([// new Event([
+        'type' => 'offsetUnset',
+        'object' => $this->object,
+        'page' => $this->page,
+        'name' => implode('.', $this->name),
+        'arguments' => [$offset]
+      ]);
+    }
+
+    if (is_null($result)) {
+      unset($this->object[$offset]);
+    }
+  }
+}
diff --git a/classes/Shortcodes/Assets.php b/classes/Shortcodes/Assets.php
index 3ebf46f..a5a3f55 100644
--- a/classes/Shortcodes/Assets.php
+++ b/classes/Shortcodes/Assets.php
@@ -80,12 +80,8 @@ public function execute(Event $event)
     $type = strtolower($options->get('type'));
     $body = trim(strip_tags($event['body'], '<link><script>'));
 
-    if ($inline = $options->get('inline')) {
-      if ($type === 'css') {
-        $grav['assets']->addInlineCss($body);
-      } elseif ($type === 'js') {
-        $grav['assets']->addInlineJs($body);
-      }
+    if ($options->get('inline')) {
+      $shortcodes->addExtra('assets', 'addInline'. ucfirst($type), $body);
     } else {
       /* @var \Grav\Common\Page\Page $page */
       $page = $event['page'];
@@ -123,7 +119,7 @@ public function execute(Event $event)
           }
         }
 
-        $grav['assets']->{$name}($url, $priority, $pipeline, $loading);
+        $shortcodes->addExtra('assets', $name, [$url, $priority, $pipeline, $loading]);
       }
     }
   }
diff --git a/classes/Shortcodes/Summary.php b/classes/Shortcodes/Summary.php
index 3fa0530..93c3b6b 100644
--- a/classes/Shortcodes/Summary.php
+++ b/classes/Shortcodes/Summary.php
@@ -47,6 +47,9 @@ public function execute(Event $event)
     /* @var \Grav\Common\Page\Page $page */
     $page = $event['page'];
 
+    /* @var \Grav\Plugin\Shortcodes\Shortcodes $shortcodes */
+    $shortcodes = $event['shortcodes'];
+
     /* @var \Grav\Common\Data\Data $options */
     $options = $event['options'];
     $options->setDefaults($this->defaults);
diff --git a/languages.yaml b/languages.yaml
new file mode 100644
index 0000000..45e33f2
--- /dev/null
+++ b/languages.yaml
@@ -0,0 +1,82 @@
+# German
+de:
+  PLUGINS:
+    SHORTCODES:
+      GLOBAL_CONFIG: "Globale Einstellungen"
+      DEFAULT_CONFIG: "Standardeinstellungen für Shortcodes"
+      PLUGIN_STATUS: "Plugin Status"
+
+      OPTIONS: "Optionen"
+
+      ASSETS: "Assets"
+      ASSETS_ENABLED: "<code>{{% assets %}}</code> Shortcode aktivieren"
+      ASSETS_OPTIONS:
+        TYPE: "Assets-Typ"
+        CSS: "CSS"
+        JS: "JavaScript"
+        INLINE: "Assets als Inline-Element"
+        PRIORITY: "Assets Priorität"
+        PRIORITY_HELP: "Priorität des Assets, wenn sie zur Grav Pipeline hinzugefügt werden; größere Werte werden zuerst geladen"
+        PIPELINE: "Kombiniere Assets"
+        LOAD: "Ladeverhalten"
+        LOAD_HELP: 'Lade Assets asynchron "async" oder verzögert "defer"'
+        DEFAULT: "- Standard -"
+        ASYNC: "Async - asynchrones Laden von JavaScript"
+        DEFER: "Defer - verzögertes Laden von JavaScript"
+
+      COMMENT: "Comment"
+      COMMENT_ENABLED: "<code>{{% comment %}}</code> Shortcode aktivieren"
+
+      EMBED: "Embed"
+      EMBED_ENABLED: "<code>{{% embed %}}</code> Shortcode aktivieren"
+      EMBED_TEMPLATE: "Standard Seiten-Template"
+
+      MARKDOWN: "Markdown"
+      MARKDOWN_ENABLED: "<code>{{% markdown %}}</code> Shortcode aktivieren"
+
+      SUMMARY: "Summary"
+      SUMMARY_ENABLED: "<code>{{% summary %}}</code> Shortcode aktivieren"
+
+      TWIG: "Twig"
+      TWIG_ENABLED: "<code>{{% twig %}}</code> Shortcode aktivieren"
+
+# English
+en:
+  PLUGINS:
+    SHORTCODES:
+      GLOBAL_CONFIG: "Global plugin configurations"
+      DEFAULT_CONFIG: "Default values for Shortcodes configuration"
+      PLUGIN_STATUS: "Plugin status"
+      OPTIONS: "Options"
+
+      ASSETS: "Assets"
+      ASSETS_ENABLED: "Activate <code>{{% assets %}}</code> shortcode"
+      ASSETS_OPTIONS:
+        TYPE: "Default assets type"
+        CSS: "CSS"
+        JS: "JavaScript"
+        INLINE: "Inline assets by default"
+        PRIORITY: "Default assets priority"
+        PRIORITY_HELP: "Priority to add CSS or JS to Grav pipeline; bigger comes first"
+        PIPELINE: "Pipeline assets"
+        LOAD: "Load behavior"
+        LOAD_HELP: 'Load asset either asynchronously "async" or deferred "defer"'
+        DEFAULT: "- default -"
+        ASYNC: "Async - asynchronously load JavaScript"
+        DEFER: "Defer - deferred loading of JavaScript"
+
+      COMMENT: "Comment"
+      COMMENT_ENABLED: "Activate <code>{{% comment %}}</code> shortcode"
+
+      EMBED: "Embed"
+      EMBED_ENABLED: "Activate <code>{{% embed %}}</code> shortcode"
+      EMBED_TEMPLATE: "Default page template"
+
+      MARKDOWN: "Markdown"
+      MARKDOWN_ENABLED: "Activate <code>{{% markdown %}}</code> shortcode"
+
+      SUMMARY: "Summary"
+      SUMMARY_ENABLED: "Activate <code>{{% summary %}}</code> shortcode"
+
+      TWIG: "Twig"
+      TWIG_ENABLED: "Activate <code>{{% twig %}}</code> shortcode"
diff --git a/shortcodes.php b/shortcodes.php
index b35d126..82251f9 100644
--- a/shortcodes.php
+++ b/shortcodes.php
@@ -37,7 +37,7 @@ class ShortcodesPlugin extends Plugin
    *
    * @var \Grav\Plugin\Shortcodes\Shortcodes
    */
-  protected $backend;
+  protected $shortcodes;
 
   /**
    * Return a list of subscribed events.
@@ -47,15 +47,14 @@ class ShortcodesPlugin extends Plugin
   public static function getSubscribedEvents()
   {
     return [
-      'onTwigInitialized' => ['onTwigInitialized', 0],
-      'onBuildPagesInitialized' => ['onBuildPagesInitialized', 0]
+      'onPluginsInitialized' => ['onPluginsInitialized', 0]
     ];
   }
 
   /**
-   * Initialize configuration when building pages.
+   * Initialize configuration
    */
-  public function onBuildPagesInitialized()
+  public function onPluginsInitialized()
   {
     if ($this->isAdmin()) {
       $this->active = false;
@@ -63,13 +62,44 @@ public function onBuildPagesInitialized()
     }
 
     if ($this->config->get('plugins.shortcodes.enabled')) {
-      $this->init();
       $this->enable([
-        'onPageContentRaw' => ['onPageContentRaw', 0]
+        'onPageInitialized' => ['onPageInitialized', 0],
+        'onPageContentRaw' => ['onPageContentRaw', 0],
+        'onPageContentProcessed' => ['onPageContentProcessed', 0],
+        'onTwigInitialized' => ['onTwigInitialized', 0]
       ]);
     }
   }
 
+  /**
+   * Initialize page.
+   */
+  public function onPageInitialized()
+  {
+    /** @var \Grav\Common\Page\Page $page */
+    $page = $this->grav['page'];
+
+    /** @var Cache $cache */
+    $cache = $this->grav['cache'];
+
+    /** @var Debugger $debugger */
+    $debugger = $this->grav['debugger'];
+
+    $cache_id = md5('shortcodes' . $page->id() . $cache->getKey());
+    if ($data = $cache->fetch($cache_id)) {
+      $debugger->addMessage("Shortcodes Plugin cache hit.");
+
+      foreach ($data as $key => $extra) {
+        $object = ($key != 'page') ? $this->grav[$key] : $page;
+
+        foreach ($extra as $value) {
+          list($method, $arguments) = $value;
+          call_user_func_array([$object, $method], $arguments);
+        }
+      }
+    }
+  }
+
   /**
    * Add content after page content was read into the system.
    *
@@ -88,11 +118,28 @@ public function onPageContentRaw(Event $event)
     if ($config->get('enabled')) {
       $raw = $page->getRawContent();
 
-      // Set the parsed content back into as raw content
-      $page->setRawContent($this->backend->render($raw, $config->get('shortcodes', []), $page));
+      // Set parsed content back into as raw content
+      $page->setRawContent($this->init()->render($raw, $config->get('shortcodes', []), $page));
     }
   }
 
+  /**
+   * Add content after page was processed.
+   *
+   * @param Event $event An event object, when `onPageContentProcessed`
+   *                     is fired.
+   */
+  public function onPageContentProcessed(Event $event)
+  {
+    // Get the page header
+    $page = $event['page'];
+
+    // Get modified content, replace all tokens with their
+    // respective shortcodes and write content back to page
+    $content = $page->getRawContent();
+    $page->setRawContent($this->init()->normalize($content));
+  }
+
   /**
    * Initialize Twig configuration and filters.
    */
@@ -125,7 +172,7 @@ public function shortcodeFunction($content, $params = [])
    */
   protected function init()
   {
-    if (!$this->backend) {
+    if (!$this->shortcodes) {
       // Initialize Autoloader
       require_once(__DIR__.'/classes/Autoloader.php');
 
@@ -133,9 +180,9 @@ protected function init()
       $autoloader->register();
 
       // Initialize back-end
-      $this->backend = new Shortcodes\Shortcodes($this->config);
+      $this->shortcodes = new Shortcodes\Shortcodes($this->config);
     }
 
-    return $this->backend;
+    return $this->shortcodes;
   }
 }
diff --git a/shortcodes.yaml b/shortcodes.yaml
index c208904..b03db83 100644
--- a/shortcodes.yaml
+++ b/shortcodes.yaml
@@ -9,7 +9,7 @@ shortcodes:
     enabled: true
     options:
       type: "css"           # Assets type (either "css" or "js")
-      inline: false         # Include assets as block or inline argument
+      inline: false         # Include assets as block or inline expression
       priority: 10          # Priority to add CSS or JS to Grav pipeline, bigger comes first
       pipeline: false       # Pipeline assets or not
       load: ""              # Load asset either asynchronously "async" or deferred "defer"