Refactoring model properties cache