Added working cache mechanisms