Fixing bug in PHQL cache, fixing Uniqueness validator messages