Client should re-prepare a query when it receives "index not found" error

When a user removes and re-creates an index server-side, the client-side prepared query cache may continue to reference the old index id.  When the application issues a query using the now invalid index id, the query service responds with error message "queryport.indexNotFound" and error code 12016.

There are manual workarounds, but the Java SDK already includes code for retrying prepared queries when the error message is "queryport.indexNotFound" but limits retries to error code 5000.  Can we also re-prepare on error 12016?