Begin preparing for i-cache.  Issue #29