Updated scenarios, added simple cache configuration