#33 Extract static inner classes out of RICache.