added fixes, new cache