Removed CacheNumbers
Added eval for boolean/int values