diff --git a/.travis.yml b/.travis.yml
index 8646647..3b812ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,12 @@ env:
 
 matrix:
   include:
-    - php: 5.3
-      env: DB=PGSQL CORE_RELEASE=3.1
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3.1
+      env: DB=PGSQL CORE_RELEASE=3.1
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=3.1
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3.2
 
 before_script:
  - phpenv rehash
diff --git a/_config.php b/_config.php
deleted file mode 100644
index fdd4107..0000000
--- a/_config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-// Set the cache lifetime to 5 mins.
-SS_Cache::set_cache_lifetime('VersionFeed_Controller', 5*60);
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..69d8bbb
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,10 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.2.0]
+
+* Changelog added.
+* Add `ContentFilter.cache_lifetime` config to set the cache lifetime.
diff --git a/code/caching/ContentFilter.php b/code/caching/ContentFilter.php
index ad7c3e8..be26b95 100644
--- a/code/caching/ContentFilter.php
+++ b/code/caching/ContentFilter.php
@@ -14,6 +14,14 @@ abstract class ContentFilter {
 	 * @var ContentFilter
 	 */
 	protected $nestedContentFilter;
+
+	/**
+	 * Cache lifetime
+	 *
+	 * @config
+	 * @var int
+	 */
+	private static $cache_lifetime = 300;
 	
 	public function __construct($nestedContentFilter = null) {
 		$this->nestedContentFilter = $nestedContentFilter;
@@ -27,6 +35,10 @@ abstract class ContentFilter {
 	protected function getCache() {
 		$cache = \SS_Cache::factory('VersionFeed_Controller');
 		$cache->setOption('automatic_serialization', true);
+
+		// Map 0 to null for unlimited lifetime
+		$lifetime = \Config::inst()->get(get_class($this), 'cache_lifetime') ?: null;
+		$cache->setLifetime($lifetime);
 		return $cache;
 	}
 	
diff --git a/docs/en/developer.md b/docs/en/developer.md
index 1d9fa82..645b41b 100644
--- a/docs/en/developer.md
+++ b/docs/en/developer.md
@@ -60,3 +60,7 @@ Another important variable is the `RateLimitFilter.lock_timeout` config, which i
 This should be increased on sites which may be slow to generate page versions, whether due to lower
 server capacity or volume of content (number of page versions). Requests to this page after the timeout
 will not trigger any rate limit safeguard, so you should be sure that this is set to an appropriate level.
+
+You can set the `ContentFilter.cache_lifetime` config in order to control the maximum age of the cache.
+This is an integer value in seconds, and defaults to 300 (five minutes). Set it to 0 or null to make this
+cache unlimited.
\ No newline at end of file