Stupid cache implementation added