diff --git a/index-redis-page-cache.php b/index-redis-page-cache.php
index 97892f9c5c4929d7cc4d35f7129e77c0f604792d..4bd66c3a1b06872e1521a4890ae3c569b9e4c860 100644
--- a/index-redis-page-cache.php
+++ b/index-redis-page-cache.php
@@ -57,18 +57,16 @@ function redis_page_cache_exception_handler( $exception ) {
  *
  * DO NOT EDIT BELOW THIS LINE!
  */
-$redis_page_cache_config['current_url'] = redis_page_cache_get_clean_url();
-$redis_page_cache_config['redis_key']   = md5( 'v' . $redis_page_cache_config['cache_version'] . '-' . $redis_page_cache_config['current_url'] );
 
 // Start the timer so we can track the page load time
 if ( $redis_page_cache_config['debug'] || $redis_page_cache_config['stats'] ) {
 	$start = microtime();
 }
 
-/**
- * SET SEPARATE CACHES FOR BROAD DEVICE TYPES
- */
-$redis_page_cache_config['redis_key'] = redis_page_cache_set_device_key( $redis_page_cache_config['redis_key'] );
+// Make run-time additions to configuration
+$redis_page_cache_config['current_url'] = redis_page_cache_get_clean_url();
+$redis_page_cache_config['redis_key']   = md5( 'v' . $redis_page_cache_config['cache_version'] . '-' . $redis_page_cache_config['current_url'] );
+$redis_page_cache_config['redis_key']   = redis_page_cache_set_device_key( $redis_page_cache_config['redis_key'] );
 
 /**
  * UTILITY FUNCTIONS