removed cache_clear
Merge branch 'feature/test_test_mmj' into develop