#326 removed cache from memo
#326 better handling of fake classes
#326 added test
Merge remote branch 'fork/326'