diff --git a/templates/icehouse/metadata_agent.ini b/templates/icehouse/metadata_agent.ini
new file mode 100644
index 00000000..4bb21230
--- /dev/null
+++ b/templates/icehouse/metadata_agent.ini
@@ -0,0 +1,19 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+# Metadata service seems to cache neutron api url from keystone so trigger
+# restart if it changes: {{ quantum_url }}
+[DEFAULT]
+auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+auth_region = {{ region }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_username }}
+admin_password = {{ service_password }}
+root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
+state_path = /var/lib/neutron
+# Gateway runs a metadata API server locally
+nova_metadata_ip = {{ local_ip }}
+nova_metadata_port = 8775
+metadata_proxy_shared_secret = {{ shared_secret }}
+cache_url = memory://?default_ttl=5
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index e8a482d5..80940aef 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -628,6 +628,8 @@ class QuantumGatewayBasicDeployment(OpenStackAmuletDeployment):
                 'nova_metadata_ip': quantum_gateway_relation['private-address'],
                 'nova_metadata_port': '8775'
             }
+        if self._get_openstack_release() >= self.precise_icehouse:
+	    expected['cache_url'] = 'memory://?default_ttl=5'
 
         ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
         if ret: