diff --git a/cache.c b/cache.c
index 3c8af5e5..4cce5089 100644
--- a/cache.c
+++ b/cache.c
@@ -14,12 +14,12 @@ uint32_t djb33x_hash(char *key, int keylen) {
 	return hash;
 }
 
-inline uint16_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
+inline uint32_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
 
 	uint32_t hash = djb33x_hash(key, keylen);
-	int i;
+	uint32_t i;
 
-	for(i=1;i<uwsgi.cache_max_items;i++) {
+	for(i=1;i< uwsgi.cache_max_items;i++) {
 		// end of table ?
 		//uwsgi_log("cache item %d -> %d %d %d %.*s %d\n", i, uwsgi.cache_items[i].used, uwsgi.cache_items[i].djbhash, uwsgi.cache_items[i].keysize, uwsgi.cache_items[i].keysize, uwsgi.cache_items[i].key, uwsgi.cache_items[i].valsize);
 		if (uwsgi.cache_items[i].used == 0) break;
@@ -38,10 +38,14 @@ inline uint16_t uwsgi_cache_get_index(char *key, uint16_t keylen) {
 	return 0;
 }
 
+uint32_t uwsgi_cache_exists(char *key, uint16_t keylen) {
+
+	return uwsgi_cache_get_index(key, keylen);
+}
 
 char *uwsgi_cache_get(char *key, uint16_t keylen, uint16_t *valsize) {
 
-	uint16_t index = uwsgi_cache_get_index(key, keylen);
+	uint32_t index = uwsgi_cache_get_index(key, keylen);
 
 	/* is locking needed for reading ?
 	   I do not think so:
@@ -63,7 +67,7 @@ char *uwsgi_cache_get(char *key, uint16_t keylen, uint16_t *valsize) {
 
 int uwsgi_cache_del(char *key, uint16_t keylen) {
 
-	uint16_t index = 0;
+	uint32_t index = 0;
 	struct uwsgi_cache_item *uci;
 	int ret = -1;
 
@@ -85,7 +89,7 @@ int uwsgi_cache_del(char *key, uint16_t keylen) {
 
 int uwsgi_cache_set(char *key, uint16_t keylen, char *val, uint16_t vallen, uint64_t expires) {
 
-	uint16_t index = 0 ;
+	uint32_t index = 0 ;
 	struct uwsgi_cache_item *uci;
 	int ret = -1;
 	if (!keylen || !vallen) return -1;
diff --git a/master.c b/master.c
index e4f4e89d..ec604017 100644
--- a/master.c
+++ b/master.c
@@ -482,7 +482,7 @@ void master_loop(char **argv, char **environ) {
 
 			// remove expired cache items
 			if (uwsgi.cache_max_items > 0) {
-				for(i=0;i<uwsgi.cache_max_items;i++) {
+				for(i=0;i< (int)uwsgi.cache_max_items;i++) {
 					if (uwsgi.cache_items[i].expires) {
 						if (uwsgi.cache_items[i].expires < current_time) {
 							uwsgi_cache_del(uwsgi.cache_items[i].key, uwsgi.cache_items[i].keysize);
diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c
index d700fa93..45b909ec 100644
--- a/plugins/python/uwsgi_pymodule.c
+++ b/plugins/python/uwsgi_pymodule.c
@@ -1936,6 +1936,24 @@ PyObject *py_uwsgi_cache_set(PyObject * self, PyObject * args) {
 }
 
 
+PyObject *py_uwsgi_cache_exists(PyObject * self, PyObject * args) {
+
+	char *key ;
+
+	if (!PyArg_ParseTuple(args, "s:cache_exists", &key)) {
+                return NULL;
+        }
+
+	if (uwsgi_cache_exists(key, strlen(key))) {
+		Py_INCREF(Py_True);
+		return Py_True;
+	}
+
+	Py_INCREF(Py_None);
+	return Py_None;
+	
+}
+
 PyObject *py_uwsgi_cache_get(PyObject * self, PyObject * args) {
 
 	char *key ;
@@ -1961,6 +1979,7 @@ static PyMethodDef uwsgi_cache_methods[] = {
 	{"cache_get", py_uwsgi_cache_get, METH_VARARGS, ""},
 	{"cache_set", py_uwsgi_cache_set, METH_VARARGS, ""},
 	{"cache_del", py_uwsgi_cache_del, METH_VARARGS, ""},
+	{"cache_exists", py_uwsgi_cache_exists, METH_VARARGS, ""},
 	{NULL, NULL},
 };
 
diff --git a/uwsgi.c b/uwsgi.c
index 9cb27174..ab4b3f09 100644
--- a/uwsgi.c
+++ b/uwsgi.c
@@ -903,7 +903,7 @@ options_parsed:
                         exit(1);
 		}
 		
-		for(i=0;i<uwsgi.cache_max_items;i++) {
+		for(i=0;i< (int) uwsgi.cache_max_items;i++) {
 			memset(&uwsgi.cache_items[i], 0, sizeof(struct uwsgi_cache_item));
 		}
 
diff --git a/uwsgi.h b/uwsgi.h
index f3cf005d..83ada6ca 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -836,7 +836,7 @@ struct uwsgi_server {
 	int cluster_fd;
 	struct sockaddr_in mc_cluster_addr;
 
-	uint16_t 	cache_max_items;
+	uint32_t 	cache_max_items;
 	struct uwsgi_cache_item	*cache_items;
 	void		*cache;
 	void *cache_lock;
@@ -1234,6 +1234,7 @@ char *uwsgi_cluster_best_node(void);
 int uwsgi_cache_set(char *, uint16_t, char *, uint16_t, uint64_t);
 int uwsgi_cache_del(char *, uint16_t);
 char *uwsgi_cache_get(char *, uint16_t, uint16_t *);
+uint32_t uwsgi_cache_exists(char *, uint16_t);
 
 #define uwsgi_mmap_shared_lock() mmap(NULL, sizeof(pthread_mutexattr_t) + sizeof(pthread_mutex_t), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0)