Updates to cache manifest handling