Fix multiple call of __init for Drive singleton
and add additional Query cache