jcache-263 merged