cleanup changes into make_escape_cache
remove outdated, misleading and buggy "samples"
Merge branch 'master' into possible-speedups