* Rework caching and timeout handling * Fix another caching related issue Signed-off-by: Leo Siepel <leosiepel@gmail.com>