diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index 617565a9be9ed..5a6f402abcf19 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -28,7 +28,7 @@ COM_MODULES_EXTENSION_UNPUBLISHED_DISABLED="Module disabled and unpublished"
 COM_MODULES_EXTENSION_UNPUBLISHED_ENABLED="Module enabled and unpublished"
 COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL="Automatic title"
 COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC="Set yes if you want an automatic translated title. Its use depends on the administrator template."
-COM_MODULES_FIELD_CACHE_TIME_DESC="The time before the module is recached"
+COM_MODULES_FIELD_CACHE_TIME_DESC="The time in minutes before the module is recached"
 COM_MODULES_FIELD_CACHE_TIME_LABEL="Cache Time"
 COM_MODULES_FIELD_CACHING_DESC="Select whether to cache the content of this module"
 COM_MODULES_FIELD_CACHING_LABEL="Caching"
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index 2c4f73b6e30b9..80b592d8f52d9 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -68,7 +68,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 			</fieldset>
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index e60de1b69c27d..876b7b0f9cb0e 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -138,7 +138,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 			</fieldset>
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index f329e0c6cac42..de02d41de02fe 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -61,7 +61,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index 2f7f50f26da7d..be938938c2d27 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -97,7 +97,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index 051e835dcef27..3a6a691b6bb82 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -468,8 +468,8 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
 			$cache->setCaching(false);
 		}
 
-		// Module cache is set in seconds, global cache in minutes, setLifeTime works in minutes
-		$cache->setLifeTime($moduleparams->get('cache_time', $conf->get('cachetime') * 60) / 60);
+		// setLifeTime works in minutes
+		$cache->setLifeTime($moduleparams->get('cache_time', $conf->get('cachetime')));
 
 		$wrkaroundoptions = array('nopathway' => 1, 'nohead' => 0, 'nomodules' => 1, 'modulemode' => 1, 'mergehead' => 1);
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index ef59b14f2b465..a9504523d9669 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -53,7 +53,7 @@
 				</field>
 
 				<field name="cache_time" type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 746a15eacf389..b64f9f68d0311 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -117,15 +117,24 @@
 				label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 				description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
 
-			<field name="owncache" type="list" default="1"
-				label="COM_MODULES_FIELD_CACHING_LABEL" description="COM_MODULES_FIELD_CACHING_DESC" >
+			<field
+				name="owncache"
+				type="list"
+				default="1"
+				label="COM_MODULES_FIELD_CACHING_LABEL"
+				description="COM_MODULES_FIELD_CACHING_DESC"
+			>
 				<option value="1">JGLOBAL_USE_GLOBAL</option>
-				<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING
-				</option>
+				<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 			</field>
 
-			<field name="cache_time" type="text" default="900"
-				label="COM_MODULES_FIELD_CACHE_TIME_LABEL" description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+			<field
+				name="cache_time"
+				type="text"
+				default="15"
+				label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+				description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+			/>
 		</fieldset>
 	</fields>
 	</config>
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 78199ce10f51f..43b2aece997aa 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -412,22 +412,38 @@
 			</fieldset>
 
 			<fieldset name="advanced">
-				<field name="layout" type="modulelayout"
-					label="JFIELD_ALT_LAYOUT_LABEL" description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
 
-				<field name="moduleclass_sfx" type="textarea" rows="3"
+				<field
+					name="moduleclass_sfx"
+					type="textarea" rows="3"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
 
-				<field name="owncache" type="list" default="1"
-					label="COM_MODULES_FIELD_CACHING_LABEL" description="COM_MODULES_FIELD_CACHING_DESC" >
+				<field
+					name="owncache"
+					type="list"
+					default="1"
+					label="COM_MODULES_FIELD_CACHING_LABEL" 
+					description="COM_MODULES_FIELD_CACHING_DESC"
+				>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING
 					</option>
 				</field>
 
-				<field name="cache_time" type="text" default="900"
-					label="COM_MODULES_FIELD_CACHE_TIME_LABEL" description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
+				<field 
+					name="cache_time"
+					type="text"
+					default="15"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+				/>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index 5b1da12ab7ab9..64ad9546093c3 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -124,7 +124,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index b8e2f859ff770..905f3a0b335d7 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -191,7 +191,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index bc7cea0844718..1d64865be0b06 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -93,7 +93,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index 6f9dc91214683..fb0c06d62f7b5 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -138,7 +138,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 			</fieldset>
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 07c424d73d1e9..b6116edd3c849 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -95,7 +95,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index e2216f4eb792f..a854c337613c1 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -71,7 +71,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index edc9fd6b963ed..be1b7d1b072b2 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -139,7 +139,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 			</fieldset>
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index 734eb1d4c23f5..e5625bcd2c3a8 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -50,7 +50,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index caa16752b74f4..4cce3de753f98 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -139,7 +139,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index a321829a5bc1c..8198fc1a7d014 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -137,7 +137,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml
index 4b9226b50d4e7..0b4789bc4d0ef 100644
--- a/modules/mod_search/mod_search.xml
+++ b/modules/mod_search/mod_search.xml
@@ -133,7 +133,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index 90c015412b198..b4d4e75da73f4 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -96,7 +96,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index a77b3d16c850c..70efa4271e0f6 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -73,7 +73,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_weblinks/mod_weblinks.xml b/modules/mod_weblinks/mod_weblinks.xml
index 86a1b3b6ed56d..0a61606a735ad 100644
--- a/modules/mod_weblinks/mod_weblinks.xml
+++ b/modules/mod_weblinks/mod_weblinks.xml
@@ -155,7 +155,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index d521b777b4015..effd6fa43f564 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -124,7 +124,7 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
+					default="15"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
 				<field