applied patch
invokeFieldItemPrepareCache removed
cleanup