Remove name from criteria
Change constance to cached object