Altered parse caching to be scoped by expression type. For #37
Store model references as strings instead of model objects. For #37