Index: branches/1.1.x/platform/elements/header.elm.tpl
===================================================================
diff -u -N -r13088 -r13169
--- branches/1.1.x/platform/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 13088)
+++ branches/1.1.x/platform/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 13169)
@@ -18,29 +18,35 @@
 							<input type="hidden" name="events[lang][OnChangeLanguage]" value="" />
 							<inp2:m_Phrase label="lu_YourLanguage"/>:
 							<select name="language" class="input-select" onchange="document.getElementById('lang_form').submit()">
-								<inp2:m_DefineElement name="lang_elem" no_editing="1">
-									<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
-								</inp2:m_DefineElement>
-								<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
+
+								<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
+									<inp2:m_DefineElement name="lang_elem" no_editing="1">
+										<option value="<inp2:Field name="LanguageId"/>" <inp2:m_if check="SelectedLanguage">selected="selected"</inp2:m_if> ><inp2:Field name="PackName"/></option>
+									</inp2:m_DefineElement>
+
+									<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
+								</inp2:m_Cache>
 							</select>
 						</form>
 					</td>
 
 					<!--## THEME DROP-DOWN ##-->
-					<!--##
 					<td class="top-select-padding">
 						<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
 							<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
 							<inp2:m_Phrase label="lu_CurrentTheme"/>:
 							<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
-								<inp2:m_DefineElement name="theme_elem">
-									<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
-								</inp2:m_DefineElement>
-								<inp2:theme_PrintList render_as="theme_elem" no_table="1"/>
+
+								<inp2:m_Cache key="prefix:theme;skip_var:t,page,per_page,sort_by">
+									<inp2:m_DefineElement name="theme_elem">
+										<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
+									</inp2:m_DefineElement>
+
+									<inp2:theme_PrintList render_as="theme_elem"/>
+								</inp2:m_Cache>
 							</select>
 						</form>
 					</td>
-					##-->
 					<!--## /THEME DROP-DOWN ##-->
 
 					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">