moving swapped and non swapped models on apps
added small fix to avoid test failure
clear cached properties when clear_cache is invoked