Wrap doc into list only if doc type is not list or generator
Add extra paramere to cache results
Do not cache queries when calling update