cache key & closure bug fixed
merge branch