Index: branches/1.1.x/in-news/designs/section.tpl
===================================================================
diff -u -r13160 -r13169
--- branches/1.1.x/in-news/designs/section.tpl	(.../section.tpl)	(revision 13160)
+++ branches/1.1.x/in-news/designs/section.tpl	(.../section.tpl)	(revision 13169)
@@ -21,18 +21,21 @@
 		<div class="movable-element">
 			<inp2:m_RenderElement name="in-news/elements/side_boxes/action_box.elm" design="blue_box"/>
 		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
+
+		<inp2:m_Cache key="prefix:n">
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-news/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-news/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-news/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-news/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
+			</div>
+		</inp2:m_Cache>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
@@ -55,58 +58,62 @@
 		<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
 	</div>
 
-	<div class="movable-element">
-		<!-- category lead articles -->
-		<inp2:m_RenderElement design="content_box" data_exists="1">
-			<inp2:n_InitList list_name="category_lead" types="cat_lead" per_page="-1"/>
+	<inp2:m_Cache key="prefix:n;guest_only">
+		<div class="movable-element">
+			<!-- category lead articles -->
+			<inp2:m_RenderElement design="content_box" data_exists="1">
+				<inp2:n_InitList list_name="category_lead" types="cat_lead" per_page="-1"/>
 
-			<inp2:m_Capture to_var="header">
-				<inp2:m_phrase name="lu_title_CategoryLeadStory"/>
-			</inp2:m_Capture>
+				<inp2:m_Capture to_var="header">
+					<inp2:m_phrase name="lu_title_CategoryLeadStory"/>
+				</inp2:m_Capture>
 
-			<table class="table-gradient-grey" width="100%">
-				<inp2:n_ListArticles list_name="category_lead" render_as="category_lead_article_element" no_table="1"/>
-			</table>
-		</inp2:m_RenderElement>
-		<!-- // category lead articles -->
-	</div>
+				<table class="table-gradient-grey" width="100%">
+					<inp2:n_ListArticles list_name="category_lead" render_as="category_lead_article_element" no_table="1"/>
+				</table>
+			</inp2:m_RenderElement>
+			<!-- // category lead articles -->
+		</div>
 
-	<div class="movable-element">
-		<!-- articles in category -->
-		<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
-			<inp2:m_include template="in-news/elements/articles.elm"/>
-			<inp2:n_InitList list_name="items_in_current_cat" main_list="1"/>
+		<div class="movable-element">
+			<!-- articles in category -->
+			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_articles">
+				<inp2:m_include template="in-news/elements/articles.elm"/>
+				<inp2:n_InitList list_name="items_in_current_cat" main_list="1"/>
 
-			<inp2:m_Capture to_var="header">
-				<inp2:m_phrase name="lu_title_Articles"/> (<inp2:n_TotalRecords list_name="items_in_current_cat"/>)
-			</inp2:m_Capture>
+				<inp2:m_Capture to_var="header">
+					<inp2:m_phrase name="lu_title_Articles"/> (<inp2:n_TotalRecords list_name="items_in_current_cat"/>)
+				</inp2:m_Capture>
 
-			<inp2:m_include template="in-news/elements/sorting.elm" list_name="items_in_current_cat"/>
+				<inp2:m_include template="in-news/elements/sorting.elm" list_name="items_in_current_cat"/>
 
-			<table class="fullwidth item-listing table-border">
-				<inp2:n_ListArticles list_name="items_in_current_cat" render_as="article_element" direction="H"/>
-			</table>
+				<table class="fullwidth item-listing table-border">
+					<inp2:n_ListArticles list_name="items_in_current_cat" render_as="article_element" direction="H"/>
+				</table>
 
-			<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="items_in_current_cat"/>
+				<inp2:m_include template="platform/elements/pagination.elm" prefix="n" list_name="items_in_current_cat"/>
 
-			<div align="left">
-				<a href="<inp2:c_CategoryLink template="in-news/elements/rss.xml" cat_id="current"/>"><inp2:m_Phrase name="lu_rss_feed"/></a>
-			</div>
-		</inp2:m_RenderElement>
-		<!-- // articles in category -->
-	</div>
+				<div align="left">
+					<a href="<inp2:c_CategoryLink template="in-news/elements/rss.xml" cat_id="current"/>"><inp2:m_Phrase name="lu_rss_feed"/></a>
+				</div>
+			</inp2:m_RenderElement>
+			<!-- // articles in category -->
+		</div>
+	</inp2:m_Cache>
 
 	<!--## LIST RELATED CATEGORIES ##-->
 	<!--##
-	<div class="movable-element">
-		<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
-			<inp2:m_Capture to_var="header">
-				<inp2:m_Phrase label="lu_title_RelatedCategories"/>
-			</inp2:m_Capture>
+	<inp2:m_Cache key="prefix:c">
+		<div class="movable-element">
+			<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
+				<inp2:m_Capture to_var="header">
+					<inp2:m_Phrase label="lu_title_RelatedCategories"/>
+				</inp2:m_Capture>
 
-			<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
-		</inp2:m_RenderElement>
-	</div>
+				<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
+			</inp2:m_RenderElement>
+		</div>
+	</inp2:m_Cache>
 	##-->
 	<!--## //LIST RELATED CATEGORIES ##-->
 </inp2:m_DefineElement>
Index: branches/1.1.x/in-commerce/elements/side_boxes/categories.elm.tpl
===================================================================
diff -u -r13088 -r13169
--- branches/1.1.x/in-commerce/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/elements/side_boxes/categories.elm.tpl	(.../categories.elm.tpl)	(revision 13169)
@@ -29,22 +29,25 @@
 	<inp2:m_Phrase label="lu_title_Categories"/>
 </inp2:m_Capture>
 
-<table width="100%">
-	<inp2:m_DefineElement name="category_elem">
-		<td class="top-category-padding">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" /><br />
-		</td>
-		<td valign="top">
-			<inp2:m_if check="IsCurrent">
-				<strong><inp2:Field name="Name"/></strong><br />
-			<inp2:m_else/>
-				<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><inp2:Field name="Name"/></a><br />
-			</inp2:m_if>
-			<table>
-			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="4" no_table="1"/>
-			</table>
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
-		</td>
-	</inp2:m_DefineElement>
-	<inp2:c_ListCategories render_as="category_elem" per_page="-1" columns="1" direction="H" parent_cat_id="Root" module="In-Commerce"/>
-</table>
+<inp2:m_Cache key="prefix:c;skip_var:t,page,per_page,sort_by">
+	<table width="100%">
+		<inp2:m_DefineElement name="category_elem">
+			<td class="top-category-padding">
+				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-1-level.gif" alt="" width="6" height="5" border="0" /><br />
+			</td>
+			<td valign="top">
+				<inp2:m_if check="IsCurrent">
+					<strong><inp2:Field name="Name"/></strong><br />
+				<inp2:m_else/>
+					<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="top-category"><inp2:Field name="Name"/></a><br />
+				</inp2:m_if>
+				<table>
+				<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="4" no_table="1"/>
+				</table>
+				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
+			</td>
+		</inp2:m_DefineElement>
+
+		<inp2:c_ListCategories render_as="category_elem" per_page="-1" columns="1" direction="H" parent_cat_id="Root" module="In-Commerce"/>
+	</table>
+</inp2:m_Cache>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/elements/currency_picker.elm.tpl
===================================================================
diff -u -r13088 -r13169
--- branches/1.1.x/in-commerce/elements/currency_picker.elm.tpl	(.../currency_picker.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/elements/currency_picker.elm.tpl	(.../currency_picker.elm.tpl)	(revision 13169)
@@ -6,10 +6,14 @@
 &nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
 	<input type="hidden" name="events[curr][OnChangeCurrency]" value="" />
 	<select name="curr_iso" class="input-select" onchange="document.getElementById('cur_form').submit()">
-	<inp2:m_DefineElement name="currency">
-		<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
-	</inp2:m_DefineElement>
-	<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
+
+		<inp2:m_Cache key="prefix:curr;currency;skip_var:t,page,per_page,sort_by">
+			<inp2:m_DefineElement name="currency">
+				<option value="<inp2:Field name='ISO'/>"<inp2:m_if check="SelectedCurrency"> selected="selected"</inp2:m_if>><inp2:Field name="ISO"/></option>
+			</inp2:m_DefineElement>
+
+			<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
+		</inp2:m_Cache>
 	</select>
 </form>
 </td>
\ No newline at end of file
Index: branches/1.1.x/in-link/designs/section.tpl
===================================================================
diff -u -r13160 -r13169
--- branches/1.1.x/in-link/designs/section.tpl	(.../section.tpl)	(revision 13160)
+++ branches/1.1.x/in-link/designs/section.tpl	(.../section.tpl)	(revision 13169)
@@ -24,18 +24,21 @@
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/related_searches.elm" design="blue_box" data_exists="1"/>
 		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-link/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-link/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-link/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-link/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
-		</div>
+
+		<inp2:m_Cache key="prefix:l">
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-link/elements/side_boxes/new.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-link/elements/side_boxes/hot.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-link/elements/side_boxes/pop.elm" design="blue_box" data_exists="1"/>
+			</div>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-link/elements/side_boxes/pick.elm" design="blue_box" data_exists="1"/>
+			</div>
+		</inp2:m_Cache>
 	</div>
 </inp2:m_DefineElement>
 <!--## //SIDE-BAR ELEMENT ##-->
@@ -51,43 +54,47 @@
 			<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
 			<!--## /SUB-CATEGORIES ##-->
 		</div>
-		<div class="movable-element">
-			<!--## links in category ##-->
-			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_links">
-				<inp2:l_InitList list_name="items_in_current_cat" main_list="1"/>
 
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_Links"/> (<inp2:l_TotalRecords list_name="items_in_current_cat"/>)
-				</inp2:m_Capture>
+		<inp2:m_Cache key="prefix:l;guest_only">
+			<div class="movable-element">
+				<!--## links in category ##-->
+				<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_links">
+					<inp2:l_InitList list_name="items_in_current_cat" main_list="1"/>
 
-				<inp2:m_include template="in-link/elements/links.elm"/>
+					<inp2:m_Capture to_var="header">
+						<inp2:m_phrase name="lu_title_Links"/> (<inp2:l_TotalRecords list_name="items_in_current_cat"/>)
+					</inp2:m_Capture>
 
-				<inp2:m_include template="in-link/elements/sorting.elm" list_name="items_in_current_cat"/>
+					<inp2:m_include template="in-link/elements/links.elm"/>
 
-				<table class="fullwidth item-listing table-border">
-					<inp2:l_ListLinks list_name="items_in_current_cat" render_as="link_element" direction="H"/>
-				</table>
+					<inp2:m_include template="in-link/elements/sorting.elm" list_name="items_in_current_cat"/>
 
-				<inp2:m_include template="platform/elements/pagination.elm" prefix="l" list_name="items_in_current_cat"/>
-			</inp2:m_RenderElement>
-			<!--## // links in category ##-->
-		</div>
+					<table class="fullwidth item-listing table-border">
+						<inp2:l_ListLinks list_name="items_in_current_cat" render_as="link_element" direction="H"/>
+					</table>
+
+					<inp2:m_include template="platform/elements/pagination.elm" prefix="l" list_name="items_in_current_cat"/>
+				</inp2:m_RenderElement>
+				<!--## // links in category ##-->
+			</div>
+		</inp2:m_Cache>
 	</div>
 
 	<!--## RELATED CATEGORIES ##-->
 	<!--##
-<div class="movable-element">
-	<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
-		<inp2:m_Capture to_var="header">
-			<inp2:m_Phrase label="lu_title_RelatedCategories"/>
-		</inp2:m_Capture>
+	<inp2:m_Cache key="prefix:c">
+		<div class="movable-element">
+			<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
+				<inp2:m_Capture to_var="header">
+					<inp2:m_Phrase label="lu_title_RelatedCategories"/>
+				</inp2:m_Capture>
 
-		<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
-	</inp2:m_RenderElement>
-</div>
+				<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
+			</inp2:m_RenderElement>
+		</div>
+	</inp2:m_Cache>
 	##-->
 	<!--## // RELATED CATEGORIES ##-->
-
 </inp2:m_DefineElement>
 <!--## /MAIN CONTENT ##-->
 
Index: branches/1.1.x/in-commerce/designs/section.tpl
===================================================================
diff -u -r13160 -r13169
--- branches/1.1.x/in-commerce/designs/section.tpl	(.../section.tpl)	(revision 13160)
+++ branches/1.1.x/in-commerce/designs/section.tpl	(.../section.tpl)	(revision 13169)
@@ -24,12 +24,18 @@
 		<div class="movable-element">
 			<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
 		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-commerce/elements/side_boxes/credit_cards.elm" design="blue_box"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products.elm" design="blue_box" data_exists="1"/>
-		</div>
+
+		<inp2:m_Cache>
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-commerce/elements/side_boxes/credit_cards.elm" design="blue_box"/>
+			</div>
+		</inp2:m_Cache>
+
+		<inp2:m_Cache key="prefix:p;currency;guest_only">
+			<div class="movable-element">
+				<inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products.elm" design="blue_box" data_exists="1"/>
+			</div>
+		</inp2:m_Cache>
 	</div>
 </inp2:m_DefineElement>
 <!--## /SIDE-BAR ELEMENT ##-->
@@ -42,55 +48,61 @@
 		</div>
 		<!--## IF IN-COMMERCE HOME PAGE ##-->
 		<inp2:m_if check="p_IsModuleHome">
-			<div class="movable-element">
-				<inp2:m_include template="in-commerce/elements/content_boxes/featured_products.elm"/>
-			</div>
-			<div class="movable-element">
-				<inp2:m_include template="in-commerce/elements/content_boxes/new_products.elm"/>
-			</div>
-			<div class="movable-element">
-				<inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
-			</div>
+			<inp2:m_Cache key="prefix:p;currency;guest_only">
+				<div class="movable-element">
+					<inp2:m_include template="in-commerce/elements/content_boxes/featured_products.elm"/>
+				</div>
+				<div class="movable-element">
+					<inp2:m_include template="in-commerce/elements/content_boxes/new_products.elm"/>
+				</div>
+				<div class="movable-element">
+					<inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
+				</div>
+			</inp2:m_Cache>
 		<inp2:m_else/>
 		<!--## /IF IN-COMMERCE HOME PAGE ##-->
 
 			<div class="movable-element">
 				<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
 			</div>
 
-			<div class="movable-element">
-				<!-- Category Products List -->
-				<inp2:m_RenderElement design="content_box" block_no_data="no_products">
-					<inp2:p_InitList list_name="products_in_category" main_list="1"/>
+			<inp2:m_Cache key="prefix:p;currency;guest_only">
+				<div class="movable-element">
+					<!-- Category Products List -->
+					<inp2:m_RenderElement design="content_box" block_no_data="no_products">
+						<inp2:p_InitList list_name="products_in_category" main_list="1"/>
 
-					<inp2:m_Capture to_var="header">
-						<inp2:m_phrase name="lu_title_Products"/> (<inp2:p_TotalRecords list_name="products_in_category"/>)
-					</inp2:m_Capture>
+						<inp2:m_Capture to_var="header">
+							<inp2:m_phrase name="lu_title_Products"/> (<inp2:p_TotalRecords list_name="products_in_category"/>)
+						</inp2:m_Capture>
 
-					<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="products_in_category"/>
+						<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="products_in_category"/>
 
-					<inp2:m_include template="in-commerce/elements/products.elm"/>
+						<inp2:m_include template="in-commerce/elements/products.elm"/>
 
-					<table class="fullwidth table-border">
-						<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
-					</table>
+						<table class="fullwidth table-border">
+							<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
+						</table>
 
-					<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="products_in_category"/>
-				</inp2:m_RenderElement>
-				<!-- // Category Products List -->
-			</div>
+						<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="products_in_category"/>
+					</inp2:m_RenderElement>
+					<!-- // Category Products List -->
+				</div>
+			</inp2:m_Cache>
 
 			<!--## RELATED CATEGORIES ##-->
 			<!--##
-			<div class="movable-element">
-				<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
-					<inp2:m_Capture to_var="header">
-						<inp2:m_Phrase label="lu_title_RelatedCategories"/>
-					</inp2:m_Capture>
+			<inp2:m_Cache key="prefix:c">
+				<div class="movable-element">
+					<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
+						<inp2:m_Capture to_var="header">
+							<inp2:m_Phrase label="lu_title_RelatedCategories"/>
+						</inp2:m_Capture>
 
-					<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
-				</inp2:m_RenderElement>
-			</div>
+						<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
+					</inp2:m_RenderElement>
+				</div>
+			</inp2:m_Cache>
 			##-->
 			<!--## // RELATED CATEGORIES ##-->
 
Index: branches/1.1.x/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r13088 -r13169
--- branches/1.1.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13088)
+++ branches/1.1.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13169)
@@ -28,10 +28,12 @@
 <script type="text/javascript">
 	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
 
-	<inp2:m_DefineElement name="ml_selector_language_element">
-		<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
-		<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
-	</inp2:m_DefineElement>
+	<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
+		<inp2:m_DefineElement name="ml_selector_language_element">
+			<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
+			<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
+		</inp2:m_DefineElement>
 
-	var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+		var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+	</inp2:m_Cache>
 </script>
Index: branches/1.1.x/platform/elements/header.elm.tpl
===================================================================
diff -u -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">
Index: branches/1.1.x/platform/elements/menu_subsections.xml.tpl
===================================================================
diff -u -r13088 -r13169
--- branches/1.1.x/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 13088)
+++ branches/1.1.x/platform/elements/menu_subsections.xml.tpl	(.../menu_subsections.xml.tpl)	(revision 13169)
@@ -26,7 +26,7 @@
 				><![CDATA[<inp2:m_Param name="title"/>]]></item>
 			</inp2:m_DefineElement>
 
-			<inp2:st_CachedMenu except="index" menu_id="$page_id" category_id="$cat_id" render_as="top_sub_menu_elem"/>
+			<inp2:st_CachedMenu except="index" menu_id="$page_id" max_level="$max_level" render_as="top_sub_menu_elem"/>
     </items>
   </menu>
 </menus>
\ No newline at end of file