Add cache feature (use with caution)