Syntax fixes
Added a class level cache