MARI-24 MARI-19 updated to use birth date,  fixed cache issue