Add rigids cache feature