Merge branch 'ym/utils_cache_bugfix'