fixed some merge conflict leftovers. introduced rudiment of cache manifest