1 files changed, 8 insertions, 18 deletions
diff --git a/crypto/src/asn1/DerObjectIdentifier.cs b/crypto/src/asn1/DerObjectIdentifier.cs
index 835f18d3d..12e8ea0a8 100644
--- a/crypto/src/asn1/DerObjectIdentifier.cs
+++ b/crypto/src/asn1/DerObjectIdentifier.cs
@@ -65,13 +65,13 @@ namespace Org.BouncyCastle.Asn1
         public static DerObjectIdentifier GetInstance(Asn1TaggedObject taggedObject, bool declaredExplicit)
         {
             /*
-             * TODO[asn1] This block here is for backward compatibility, but should eventually be removed.
+             * TODO[api] This block is for backward compatibility, but should be removed.
              * 
              * - see https://github.com/bcgit/bc-java/issues/1015
              */
-            if (!declaredExplicit && !taggedObject.IsParsed())
+            if (!declaredExplicit && !taggedObject.IsParsed() && Asn1Tags.ContextSpecific == taggedObject.TagClass)
             {
-                Asn1Object baseObject = taggedObject.GetObject();
+                Asn1Object baseObject = taggedObject.GetBaseObject().ToAsn1Object();
                 if (!(baseObject is DerObjectIdentifier))
                     return FromContents(Asn1OctetString.GetInstance(baseObject).GetOctets());
             }
@@ -168,8 +168,11 @@ namespace Org.BouncyCastle.Asn1
             return new PrimitiveDerEncoding(tagClass, tagNo, GetContents());
         }
 
-        private void DoOutput(MemoryStream bOut)
+        private byte[] GetContents() => Objects.EnsureSingletonInitialized(ref contents, identifier, CreateContents);
+
+        private static byte[] CreateContents(string identifier)
         {
+            MemoryStream bOut = new MemoryStream();
             OidTokenizer tok = new OidTokenizer(identifier);
 
             string token = tok.NextToken();
@@ -197,21 +200,8 @@ namespace Org.BouncyCastle.Asn1
                     Asn1RelativeOid.WriteField(bOut, new BigInteger(token));
                 }
             }
-        }
-
-        private byte[] GetContents()
-        {
-            lock (this)
-            {
-                if (contents == null)
-                {
-                    MemoryStream bOut = new MemoryStream();
-                    DoOutput(bOut);
-                    contents = bOut.ToArray();
-                }
 
-                return contents;
-            }
+            return bOut.ToArray();
         }
 
         internal static DerObjectIdentifier CreatePrimitive(byte[] contents, bool clone)