JCache client refactor and cache close destroy re-impl (master branch of #3634)

master branch of #3634