Fix for D2644 - Navigation property should be null after FK changes and entity not in cache