Fixed/changed some signatures and added an inert file cache mechanism.