Fixed bug with memcached and map cache
Merge branch 'develop' [ci skip]