[BUG #7234] Don't cache unchanged values