Hmmmm, there's more to that than just returning the entry or returning the value. You need to do checks (or conversions in the TypeConverterInterceptor) that are different if what you're returning is an entry versus just a value. I'll check for the next iteration.