added conditional cached property
added swapped models as cached properties