Fixed issue where cached objects were showing as dirty