Add cache on json queries