diff --git a/taccsite_cms/contrib/taccsite_blockquote/cms_plugins.py b/taccsite_cms/contrib/taccsite_blockquote/cms_plugins.py
index 27e44ceb9..83cd1bada 100644
--- a/taccsite_cms/contrib/taccsite_blockquote/cms_plugins.py
+++ b/taccsite_cms/contrib/taccsite_blockquote/cms_plugins.py
@@ -19,8 +19,9 @@ class TaccsiteBlockquotePlugin(CMSPluginBase):
     name = _('Blockquote')
     render_template = 'blockquote.html'
 
-    cache = False
+    cache = True
     text_enabled = True
+    allow_children = False
 
     fieldsets = [
         (None, {
diff --git a/taccsite_cms/contrib/taccsite_blockquote/templates/blockquote.html b/taccsite_cms/contrib/taccsite_blockquote/templates/blockquote.html
index 9e66c7622..71fea29cd 100644
--- a/taccsite_cms/contrib/taccsite_blockquote/templates/blockquote.html
+++ b/taccsite_cms/contrib/taccsite_blockquote/templates/blockquote.html
@@ -1,4 +1,4 @@
-<figure {{ instance.attributes_str }}>
+<figure {# class="s-blockquote" #}{{ instance.attributes_str }}>
   <blockquote cite="{{ instance.cite_url }}">
     <p>{{ instance.text }}</p>
   </blockquote>
diff --git a/taccsite_cms/contrib/taccsite_offset/cms_plugins.py b/taccsite_cms/contrib/taccsite_offset/cms_plugins.py
index a29b4f558..c2d1da73e 100644
--- a/taccsite_cms/contrib/taccsite_offset/cms_plugins.py
+++ b/taccsite_cms/contrib/taccsite_offset/cms_plugins.py
@@ -18,7 +18,7 @@ class TaccsiteOffsetPlugin(CMSPluginBase):
     name = _('Offset Content')
     render_template = 'offset.html'
 
-    cache = False
+    cache = True
     text_enabled = False
     allow_children = True
 
diff --git a/taccsite_cms/contrib/taccsite_offset/models.py b/taccsite_cms/contrib/taccsite_offset/models.py
index 3904e601a..845ea7a11 100644
--- a/taccsite_cms/contrib/taccsite_offset/models.py
+++ b/taccsite_cms/contrib/taccsite_offset/models.py
@@ -19,16 +19,16 @@
 
 # Helpers
 
-def get_direction_classname(offset):
-    """Get offset content class based on standard offset value."""
+def get_direction_classname(value):
+    """Get direction class based on value."""
 
-    # HELP: Should we limit input by coupling this map to DIRECTION_CHOICES?
+    # TODO: Couple this map to DIRECTION_CHOICES
     switcher = {
         'right': 'o-offset-content--right',
         'left': 'o-offset-content--left'
     }
 
-    return switcher.get(offset, '')
+    return switcher.get(value, '')
 
 
 
diff --git a/taccsite_cms/contrib/taccsite_offset/templates/offset.html b/taccsite_cms/contrib/taccsite_offset/templates/offset.html
index 98edf0c42..583ca7ad0 100644
--- a/taccsite_cms/contrib/taccsite_offset/templates/offset.html
+++ b/taccsite_cms/contrib/taccsite_offset/templates/offset.html
@@ -1,7 +1,7 @@
 {% load cms_tags %}
 
-<aside {{ instance.attributes_str }}>
-  {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
+<aside {# class="o-offset-content--..." #}{{ instance.attributes_str }}>
+  {% for plugin_instance in instance.child_plugin_instances %}
+      {% render_plugin plugin_instance %}
   {% endfor %}
 </aside>
diff --git a/taccsite_cms/contrib/taccsite_sample/cms_plugins.py b/taccsite_cms/contrib/taccsite_sample/cms_plugins.py
index 87bb30636..fcdd314ce 100644
--- a/taccsite_cms/contrib/taccsite_sample/cms_plugins.py
+++ b/taccsite_cms/contrib/taccsite_sample/cms_plugins.py
@@ -22,6 +22,7 @@ class TaccsiteSamplePlugin(CMSPluginBase):
 
     cache = False
     text_enabled = True
+    allow_children = False
     # NOTE: Use case is unclear
     # admin_preview = True
     # NOTE: To change for all TACC plugins add taccsite_cms/templates/admin/...